diff --git a/_bin/make_gallery.rb b/_bin/gallery.rb similarity index 91% rename from _bin/make_gallery.rb rename to _bin/gallery.rb index 3456a25..bf10dd8 100755 --- a/_bin/make_gallery.rb +++ b/_bin/gallery.rb @@ -22,12 +22,14 @@ out += "gallery-date: #{Time.now.to_s}\n" @images.each_with_index do |image, i| basename = File.basename(image, '.jpg') filename = year.to_s+"-"+month.to_s+"-"+basename + exif = EXIFR::JPEG.new(image) t = " - basename: #{basename}\n" - t += " date: #{EXIFR::JPEG.new(image).date_time}\n" + t += " date: #{exif.date_time}\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 diff --git a/_bin/photos.rb b/_bin/photos.rb new file mode 100755 index 0000000..108dae0 --- /dev/null +++ b/_bin/photos.rb @@ -0,0 +1,23 @@ +#!/usr/bin/env ruby + +system 'mkdir', '-p', 'out' + +require 'exifr' +require 'time' + +ARGV.each_with_index do |image, i| + basename = File.basename(image, '.jpg') + exif = EXIFR::JPEG.new(image) + filename = exif.date_time_original.year.to_s+"-"+exif.date_time_original.strftime("%m").to_s+"-"+basename + + puts "Resizing #{basename}." + thumb = "convert '#{image}' -quality 80 -resize 300x300 './out/#{filename}_t.jpg'" + `#{thumb}` + mid = "convert '#{image}' -filter Lanczos -sampling-factor 1x1 -unsharp 1.5x1+0.7+0.02 -quality 90 -resize 1300x1300 './out/#{filename}_m.jpg'" + `#{mid}` + full = "convert '#{image}' -filter Lanczos -sampling-factor 1x1 -unsharp 1.5x1+0.7+0.02 -quality 90 -resize 2500x2500 './out/#{filename}.jpg'" + `#{full}` + + paste_string = "[![basename](/assets/#{filename}_m.jpg)](/assets/#{filename}.jpg)" + puts paste_string +end diff --git a/_includes/footer.html b/_includes/footer.html index 88ba84a..4db95d6 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -17,7 +17,7 @@ diff --git a/_includes/header.html b/_includes/header.html index f0dd922..d264fe7 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -4,10 +4,11 @@ +

amdavidson.com

diff --git a/_layouts/.DS_Store b/_layouts/.DS_Store deleted file mode 100644 index c1abe71..0000000 Binary files a/_layouts/.DS_Store and /dev/null differ diff --git a/_sass/_layout.scss b/_sass/_layout.scss index f79fa53..2b1f04c 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -3,19 +3,11 @@ */ #site-header { - border-top: 1px solid #000; border-bottom: 1px solid #000; - background-color: #FFF; + background: rgba(255, 255, 255, 0.85); position: fixed; - top: 10px; - width: 100%; -} - -.site-header-blur { - position:fixed; - top: -20px; - height: 50px; width: 100%; + top: 0px; -webkit-backdrop-filter: blur(5px); backdrop-filter: blur(5px); } @@ -66,6 +58,22 @@ } +.site-title { + display: inline-block; + float: left; + text-align: center; + font-size: 1.5em; + margin-left: 20px; + + @include media-query($on-laptop) { + display: none; + } + + @include media-query($on-palm) { + display: none; + } +} + .site-nav li { width: 70px; display: inline; diff --git a/albums/franks-valley-trip-2008.yaml b/albums/franks-valley-trip-2008.yaml new file mode 100644 index 0000000..85bcc39 --- /dev/null +++ b/albums/franks-valley-trip-2008.yaml @@ -0,0 +1,103 @@ +--- +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 + 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 + image-src: /assets/2016-09-IMG_6421.jpg + mid-page: /franks-valley-trip-2008/IMG_6421/ +images: + - 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 + image-src: /assets/2016-09-IMG_6421.jpg + mid-page: /franks-valley-trip-2008/IMG_6421/ + - basename: IMG_6430 + date: 2008-08-29 15:49:07 -0400 + thumb-src: /assets/2016-09-IMG_6430_t.jpg + mid-src: /assets/2016-09-IMG_6430_m.jpg + image-src: /assets/2016-09-IMG_6430.jpg + mid-page: /franks-valley-trip-2008/IMG_6430/ + - basename: IMG_6447 + date: 2008-08-29 18:03:59 -0400 + thumb-src: /assets/2016-09-IMG_6447_t.jpg + mid-src: /assets/2016-09-IMG_6447_m.jpg + image-src: /assets/2016-09-IMG_6447.jpg + mid-page: /franks-valley-trip-2008/IMG_6447/ + - basename: IMG_6454 + date: 2008-08-29 19:58:31 -0400 + thumb-src: /assets/2016-09-IMG_6454_t.jpg + mid-src: /assets/2016-09-IMG_6454_m.jpg + image-src: /assets/2016-09-IMG_6454.jpg + mid-page: /franks-valley-trip-2008/IMG_6454/ + - basename: IMG_6458 + date: 2008-08-30 11:39:23 -0400 + thumb-src: /assets/2016-09-IMG_6458_t.jpg + mid-src: /assets/2016-09-IMG_6458_m.jpg + image-src: /assets/2016-09-IMG_6458.jpg + mid-page: /franks-valley-trip-2008/IMG_6458/ + - basename: IMG_6461 + date: 2008-08-30 11:40:54 -0400 + thumb-src: /assets/2016-09-IMG_6461_t.jpg + mid-src: /assets/2016-09-IMG_6461_m.jpg + image-src: /assets/2016-09-IMG_6461.jpg + mid-page: /franks-valley-trip-2008/IMG_6461/ + - basename: IMG_6477 + date: 2008-08-30 17:56:57 -0400 + thumb-src: /assets/2016-09-IMG_6477_t.jpg + mid-src: /assets/2016-09-IMG_6477_m.jpg + image-src: /assets/2016-09-IMG_6477.jpg + mid-page: /franks-valley-trip-2008/IMG_6477/ + - basename: IMG_6481 + date: 2008-08-31 10:00:09 -0400 + thumb-src: /assets/2016-09-IMG_6481_t.jpg + mid-src: /assets/2016-09-IMG_6481_m.jpg + image-src: /assets/2016-09-IMG_6481.jpg + mid-page: /franks-valley-trip-2008/IMG_6481/ + - basename: IMG_6488 + date: 2008-08-31 10:05:35 -0400 + thumb-src: /assets/2016-09-IMG_6488_t.jpg + mid-src: /assets/2016-09-IMG_6488_m.jpg + image-src: /assets/2016-09-IMG_6488.jpg + mid-page: /franks-valley-trip-2008/IMG_6488/ + - basename: IMG_6516 + date: 2008-08-31 14:28:06 -0400 + thumb-src: /assets/2016-09-IMG_6516_t.jpg + mid-src: /assets/2016-09-IMG_6516_m.jpg + image-src: /assets/2016-09-IMG_6516.jpg + mid-page: /franks-valley-trip-2008/IMG_6516/ + - basename: IMG_6546 + date: 2008-08-31 15:34:28 -0400 + thumb-src: /assets/2016-09-IMG_6546_t.jpg + mid-src: /assets/2016-09-IMG_6546_m.jpg + image-src: /assets/2016-09-IMG_6546.jpg + mid-page: /franks-valley-trip-2008/IMG_6546/ + - basename: IMG_6565 + date: 2008-08-31 16:40:10 -0400 + thumb-src: /assets/2016-09-IMG_6565_t.jpg + mid-src: /assets/2016-09-IMG_6565_m.jpg + image-src: /assets/2016-09-IMG_6565.jpg + mid-page: /franks-valley-trip-2008/IMG_6565/ + - basename: IMG_6577 + date: 2008-08-31 16:46:31 -0400 + thumb-src: /assets/2016-09-IMG_6577_t.jpg + mid-src: /assets/2016-09-IMG_6577_m.jpg + image-src: /assets/2016-09-IMG_6577.jpg + mid-page: /franks-valley-trip-2008/IMG_6577/ + - basename: IMG_6583 + date: 2008-08-31 17:02:26 -0400 + thumb-src: /assets/2016-09-IMG_6583_t.jpg + mid-src: /assets/2016-09-IMG_6583_m.jpg + image-src: /assets/2016-09-IMG_6583.jpg + mid-page: /franks-valley-trip-2008/IMG_6583/ + - basename: IMG_6590 + date: 2008-09-01 09:44:16 -0400 + thumb-src: /assets/2016-09-IMG_6590_t.jpg + mid-src: /assets/2016-09-IMG_6590_m.jpg + image-src: /assets/2016-09-IMG_6590.jpg + mid-page: /franks-valley-trip-2008/IMG_6590/ +--- diff --git a/albums/mikes-new-raptor.yaml b/albums/mikes-new-raptor.yaml new file mode 100644 index 0000000..d822689 --- /dev/null +++ b/albums/mikes-new-raptor.yaml @@ -0,0 +1,97 @@ +--- +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 + 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 + image-src: /assets/2016-09-IMG_7796.jpg + mid-page: /mikes-new-raptor/IMG_7796/ +images: + - 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 + image-src: /assets/2016-09-IMG_7796.jpg + mid-page: /mikes-new-raptor/IMG_7796/ + - basename: IMG_7801 + date: 2007-09-23 12:16:14 -0400 + thumb-src: /assets/2016-09-IMG_7801_t.jpg + mid-src: /assets/2016-09-IMG_7801_m.jpg + image-src: /assets/2016-09-IMG_7801.jpg + mid-page: /mikes-new-raptor/IMG_7801/ + - basename: IMG_7812 + date: 2007-09-23 12:35:06 -0400 + thumb-src: /assets/2016-09-IMG_7812_t.jpg + mid-src: /assets/2016-09-IMG_7812_m.jpg + image-src: /assets/2016-09-IMG_7812.jpg + mid-page: /mikes-new-raptor/IMG_7812/ + - basename: IMG_7836 + date: 2007-09-23 12:41:15 -0400 + thumb-src: /assets/2016-09-IMG_7836_t.jpg + mid-src: /assets/2016-09-IMG_7836_m.jpg + image-src: /assets/2016-09-IMG_7836.jpg + mid-page: /mikes-new-raptor/IMG_7836/ + - basename: IMG_7839 + date: 2007-09-23 12:41:24 -0400 + thumb-src: /assets/2016-09-IMG_7839_t.jpg + mid-src: /assets/2016-09-IMG_7839_m.jpg + image-src: /assets/2016-09-IMG_7839.jpg + mid-page: /mikes-new-raptor/IMG_7839/ + - basename: IMG_7853 + date: 2007-09-23 12:48:18 -0400 + thumb-src: /assets/2016-09-IMG_7853_t.jpg + mid-src: /assets/2016-09-IMG_7853_m.jpg + image-src: /assets/2016-09-IMG_7853.jpg + mid-page: /mikes-new-raptor/IMG_7853/ + - basename: IMG_7886 + date: 2007-09-23 13:12:56 -0400 + thumb-src: /assets/2016-09-IMG_7886_t.jpg + mid-src: /assets/2016-09-IMG_7886_m.jpg + image-src: /assets/2016-09-IMG_7886.jpg + mid-page: /mikes-new-raptor/IMG_7886/ + - basename: IMG_7925 + date: 2007-09-23 14:01:51 -0400 + thumb-src: /assets/2016-09-IMG_7925_t.jpg + mid-src: /assets/2016-09-IMG_7925_m.jpg + image-src: /assets/2016-09-IMG_7925.jpg + mid-page: /mikes-new-raptor/IMG_7925/ + - basename: IMG_7926 + date: 2007-09-23 14:02:17 -0400 + thumb-src: /assets/2016-09-IMG_7926_t.jpg + mid-src: /assets/2016-09-IMG_7926_m.jpg + image-src: /assets/2016-09-IMG_7926.jpg + mid-page: /mikes-new-raptor/IMG_7926/ + - basename: IMG_7945 + date: 2007-09-23 14:07:49 -0400 + thumb-src: /assets/2016-09-IMG_7945_t.jpg + mid-src: /assets/2016-09-IMG_7945_m.jpg + image-src: /assets/2016-09-IMG_7945.jpg + mid-page: /mikes-new-raptor/IMG_7945/ + - basename: IMG_7980 + date: 2007-09-23 14:24:58 -0400 + thumb-src: /assets/2016-09-IMG_7980_t.jpg + mid-src: /assets/2016-09-IMG_7980_m.jpg + image-src: /assets/2016-09-IMG_7980.jpg + mid-page: /mikes-new-raptor/IMG_7980/ + - basename: IMG_7995 + date: 2007-09-23 14:25:23 -0400 + thumb-src: /assets/2016-09-IMG_7995_t.jpg + mid-src: /assets/2016-09-IMG_7995_m.jpg + image-src: /assets/2016-09-IMG_7995.jpg + mid-page: /mikes-new-raptor/IMG_7995/ + - basename: IMG_8023 + date: 2007-09-23 15:28:08 -0400 + thumb-src: /assets/2016-09-IMG_8023_t.jpg + mid-src: /assets/2016-09-IMG_8023_m.jpg + image-src: /assets/2016-09-IMG_8023.jpg + mid-page: /mikes-new-raptor/IMG_8023/ + - basename: IMG_8030 + date: 2007-09-23 15:29:17 -0400 + thumb-src: /assets/2016-09-IMG_8030_t.jpg + mid-src: /assets/2016-09-IMG_8030_m.jpg + image-src: /assets/2016-09-IMG_8030.jpg + mid-page: /mikes-new-raptor/IMG_8030/ +--- diff --git a/assets/.DS_Store b/assets/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/assets/.DS_Store and /dev/null differ