From 59531c678d86121a3b8fffc93310bd2e28a6d082 Mon Sep 17 00:00:00 2001 From: Andrew Davidson Date: Mon, 2 Jan 2023 18:53:17 -0800 Subject: [PATCH] cleanup commit --- _bin/gallery.rb | 8 ++++++-- _layouts/gallery-index.html | 14 ++++++++----- _layouts/gallery-page.html | 2 +- _sass/_layout.scss | 27 ++++++++++++++++++++++---- albums/alaska-cruise.yaml | 2 +- albums/franks-valley-trip-2008.yaml | 2 +- albums/hearst-castle-2007.yaml | 2 +- albums/mikes-new-raptor.yaml | 2 +- albums/mini-baja-competition-2007.yaml | 2 +- albums/monterey-historics-2007.yaml | 2 +- albums/naomis-graduation.yaml | 2 +- albums/washington-dc-2007.yaml | 2 +- 12 files changed, 47 insertions(+), 20 deletions(-) diff --git a/_bin/gallery.rb b/_bin/gallery.rb index bf10dd8..6828c16 100755 --- a/_bin/gallery.rb +++ b/_bin/gallery.rb @@ -28,11 +28,15 @@ out += "gallery-date: #{Time.now.to_s}\n" t += " thumb-src: /assets/#{filename}_t.jpg\n" t += " mid-src: /assets/#{filename}_m.jpg\n" t += " image-src: /assets/#{filename}.jpg\n" - t += " mid-page: /#{gallery_slug}/#{basename}/\n" t += " aspect: #{(exif.pixel_x_dimension.to_f / exif.pixel_y_dimension).round(2)}\n" if i == 0 then out += "gallery-key:\n" - out += t + out += " basename: #{basename}\n" + out += " date: #{exif.date_time}\n" + out += " thumb-src: /assets/#{filename}_t.jpg\n" + out += " mid-src: /assets/#{filename}_m.jpg\n" + out += " image-src: /assets/#{filename}.jpg\n" + out += " aspect: #{(exif.pixel_x_dimension.to_f / exif.pixel_y_dimension).round(2)}\n" out += "images:\n" out += t else diff --git a/_layouts/gallery-index.html b/_layouts/gallery-index.html index 4f6e0f9..1fb1060 100644 --- a/_layouts/gallery-index.html +++ b/_layouts/gallery-index.html @@ -6,11 +6,15 @@ layout: default

Photos

- +
+{% for gallery in page.galleries %} +
+ + {{gallery['title']}} + {{gallery['date']}} +
+{% endfor %} +
{{ data }} diff --git a/_layouts/gallery-page.html b/_layouts/gallery-page.html index 0277810..6bb2c41 100644 --- a/_layouts/gallery-page.html +++ b/_layouts/gallery-page.html @@ -4,7 +4,7 @@ layout: default
-

Back to Photos

+

Back to Photos

{{page.gallery['title']}}

diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 1fa2a7e..a703c2e 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -250,16 +250,35 @@ .gallery li { float: left; padding: 10px; - width: 160px; - height: 160px; + width: 160px; + height: 160px; text-align: center; @include media-query($on_palm) { - width: 110px; + width: 110px; height: 110px; } } .gallery li img { - max-width: 100%; + max-width: 100%; max-height: 100%; } + +.gallery-index-ins { + span { + width: 100%; + display:inline-block; + } + img { + max-width: 150px; + max-height: 150px; + } + width: 200px; + height: 200px; + text-align: center; + display: inline-block; +} + + + + diff --git a/albums/alaska-cruise.yaml b/albums/alaska-cruise.yaml index f7c9a7b..603825c 100644 --- a/albums/alaska-cruise.yaml +++ b/albums/alaska-cruise.yaml @@ -3,7 +3,7 @@ gallery-title: Alaska Cruise gallery-slug: alaska-cruise gallery-date: 2007-07-29 20:47:28 -0400 gallery-key: - - basename: IMG_6885 + basename: IMG_6885 date: 2007-07-20 13:13:14 -0400 thumb-src: /assets/2016-09-IMG_6885_t.jpg mid-src: /assets/2016-09-IMG_6885_m.jpg diff --git a/albums/franks-valley-trip-2008.yaml b/albums/franks-valley-trip-2008.yaml index 59a436b..c5f4258 100644 --- a/albums/franks-valley-trip-2008.yaml +++ b/albums/franks-valley-trip-2008.yaml @@ -3,7 +3,7 @@ gallery-title: Frank's Valley Trip 2008 gallery-slug: franks-valley-trip-2008 gallery-date: 2008-09-01 17:44:16 -0400 gallery-key: - - basename: IMG_6421 + basename: IMG_6421 date: 2008-08-29 15:38:38 -0400 thumb-src: /assets/2016-09-IMG_6421_t.jpg mid-src: /assets/2016-09-IMG_6421_m.jpg diff --git a/albums/hearst-castle-2007.yaml b/albums/hearst-castle-2007.yaml index c175719..ce5996b 100644 --- a/albums/hearst-castle-2007.yaml +++ b/albums/hearst-castle-2007.yaml @@ -3,7 +3,7 @@ gallery-title: Hearst Castle 2007 gallery-slug: hearst-castle-2007 gallery-date: 2007-07-15 12:21:46 -0400 gallery-key: - - basename: IMG_6814 + basename: IMG_6814 date: 2007-07-15 10:13:08 -0400 thumb-src: /assets/2016-09-IMG_6814_t.jpg mid-src: /assets/2016-09-IMG_6814_m.jpg diff --git a/albums/mikes-new-raptor.yaml b/albums/mikes-new-raptor.yaml index 00ee8f3..ac6dc4e 100644 --- a/albums/mikes-new-raptor.yaml +++ b/albums/mikes-new-raptor.yaml @@ -3,7 +3,7 @@ gallery-title: Mike's New Raptor gallery-slug: mikes-new-raptor gallery-date: 2007-09-23 15:29:17 -0400 gallery-key: - - basename: IMG_7796 + basename: IMG_7796 date: 2007-09-23 11:55:05 -0400 thumb-src: /assets/2016-09-IMG_7796_t.jpg mid-src: /assets/2016-09-IMG_7796_m.jpg diff --git a/albums/mini-baja-competition-2007.yaml b/albums/mini-baja-competition-2007.yaml index 291df0e..5431805 100644 --- a/albums/mini-baja-competition-2007.yaml +++ b/albums/mini-baja-competition-2007.yaml @@ -3,7 +3,7 @@ gallery-title: Mini-Baja Competition 2007 gallery-slug: mini-baja-competition-2007 gallery-date: 2007-05-26 14:35:00 -0400 gallery-key: - - basename: IMG_5238 + basename: IMG_5238 date: 2007-05-24 13:45:06 -0400 thumb-src: /assets/2016-09-IMG_5238_t.jpg mid-src: /assets/2016-09-IMG_5238_m.jpg diff --git a/albums/monterey-historics-2007.yaml b/albums/monterey-historics-2007.yaml index 1add846..91da8fb 100644 --- a/albums/monterey-historics-2007.yaml +++ b/albums/monterey-historics-2007.yaml @@ -3,7 +3,7 @@ gallery-title: Monterey Historics 2007 gallery-slug: monterey-historics-2007 gallery-date: 2007-08-18 16:21:31 -0400 gallery-key: - - basename: IMG_0125 + basename: IMG_0125 date: 2007-08-19 15:32:41 -0400 thumb-src: /assets/2016-09-IMG_0125_t.jpg mid-src: /assets/2016-09-IMG_0125_m.jpg diff --git a/albums/naomis-graduation.yaml b/albums/naomis-graduation.yaml index cfe4f77..8c64b43 100644 --- a/albums/naomis-graduation.yaml +++ b/albums/naomis-graduation.yaml @@ -3,7 +3,7 @@ gallery-title: Naomi's Graduation gallery-slug: naomis-graduation gallery-date: 2007-07-16 16:48:50 -0400 gallery-key: - - basename: CRW_5981 + basename: CRW_5981 date: 2007-06-16 11:01:46 -0400 thumb-src: /assets/2016-09-CRW_5981_t.jpg mid-src: /assets/2016-09-CRW_5981_m.jpg diff --git a/albums/washington-dc-2007.yaml b/albums/washington-dc-2007.yaml index 6b4bdcd..02182b4 100644 --- a/albums/washington-dc-2007.yaml +++ b/albums/washington-dc-2007.yaml @@ -3,7 +3,7 @@ gallery-title: Washington DC 2007 gallery-slug: washington-dc-2007 gallery-date: 2007-08-08 18:20:43 -0400 gallery-key: - - basename: IMG_8360 + basename: IMG_8360 date: 2007-08-05 10:11:04 -0400 thumb-src: /assets/2016-09-IMG_8360_t.jpg mid-src: /assets/2016-09-IMG_8360_m.jpg