# HG changeset patch # User Steve Losh # Date 1501539091 14400 # Node ID 6e60d0b96c6e29c6b114669edc1d14481e8643f1 # Parent 88e1e358f43198eda89c02c822f0368438a0b686 Start the photos stuff diff -r 88e1e358f431 -r 6e60d0b96c6e Makefile --- a/Makefile Tue Apr 11 16:25:00 2017 +0000 +++ b/Makefile Mon Jul 31 18:11:31 2017 -0400 @@ -4,11 +4,12 @@ less := $(shell ffind --literal '.less') style := $(subst .less,.css,$(less)) -static/media/css/%.css: static/media/css/%.less - lessc $< > $@ +photos := $(shell ffind 'static/media/images/photography/photos/.*/.*.jpg' --entire) +thumbs := $(subst photos,thumbnails,$(photos)) -css: $(style) +THUMBNAIL_CMD = convert $< -resize "200^>" -gravity center -crop 200x200+0+0 -strip $@ +# Main ------------------------------------------------------------------------ public/index.html: $(files) $(style) hugo -t stevelosh @@ -22,3 +23,21 @@ deploy: public/index.html rsync -avz ./public/ sl:/var/www/stevelosh.com + +# CSS ------------------------------------------------------------------------- +css: $(style) + +static/media/css/%.css: static/media/css/%.less + lessc $< > $@ + +# Image Gallery Hell ---------------------------------------------------------- +thumbnails: $(thumbs) + +static/media/images/photography/thumbnails/plants/%.jpg: static/media/images/photography/photos/plants/%.jpg + $(THUMBNAIL_CMD) +static/media/images/photography/thumbnails/scotland/%.jpg: static/media/images/photography/photos/scotland/%.jpg + $(THUMBNAIL_CMD) +static/media/images/photography/thumbnails/iceland/%.jpg: static/media/images/photography/photos/iceland/%.jpg + $(THUMBNAIL_CMD) +static/media/images/photography/thumbnails/dancing/%.jpg: static/media/images/photography/photos/dancing/%.jpg + $(THUMBNAIL_CMD) diff -r 88e1e358f431 -r 6e60d0b96c6e content/about/index.markdown --- a/content/about/index.markdown Tue Apr 11 16:25:00 2017 +0000 +++ b/content/about/index.markdown Mon Jul 31 18:11:31 2017 -0400 @@ -5,7 +5,7 @@ +++ -I'm **Steve**. I'm currently living in **Reykjavík, Iceland**. +I'm **Steve**. I'm currently living in **Rochester, New York**. I do a lot of different things. If you want to get in touch with me you can [email diff -r 88e1e358f431 -r 6e60d0b96c6e content/photography/index.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/photography/index.markdown Mon Jul 31 18:11:31 2017 -0400 @@ -0,0 +1,34 @@ ++++ +date = "2017-07-28T00:00:00Z" +draft = false +title = "Photography" + ++++ + + + + + + + + + + + + + + + + diff -r 88e1e358f431 -r 6e60d0b96c6e content/photography/plants/index.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/photography/plants/index.markdown Mon Jul 31 18:11:31 2017 -0400 @@ -0,0 +1,12 @@ ++++ +date = "2017-07-28T00:00:00Z" +draft = false +title = "Plants" + ++++ + + + + diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/css/sjl.css --- a/static/media/css/sjl.css Tue Apr 11 16:25:00 2017 +0000 +++ b/static/media/css/sjl.css Mon Jul 31 18:11:31 2017 -0400 @@ -139,7 +139,7 @@ line-height: 50px; text-transform: lowercase; padding-left: 2px; - width: 210px; + width: 110px; } body .wrap .top header .amp { font-style: italic; @@ -155,7 +155,7 @@ text-align: right; text-transform: lowercase; padding-right: 2px; - width: 398px; + width: 498px; float: left; } body .wrap .top nav .sep { @@ -296,6 +296,28 @@ margin-bottom: 25px; margin-right: 25px; } +#leaf-content .photo-gallery-link { + display: inline-block; + position: relative; + width: 200px; + height: 200px; + margin-right: 1px; +} +#leaf-content .photo-gallery-link img { + display: block; + margin: 0px; + border: none; +} +#leaf-content .photo-gallery-link .caption { + width: 202px; + background: rgba(0, 0, 0, 0.6); + text-align: center; + color: white; + padding: 5px 0px 0px; + position: absolute; + left: 0px; + bottom: 10px; +} #leaf-content nav#TableOfContents ul { list-style: none; } diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/css/sjl.less --- a/static/media/css/sjl.less Tue Apr 11 16:25:00 2017 +0000 +++ b/static/media/css/sjl.less Mon Jul 31 18:11:31 2017 -0400 @@ -115,7 +115,7 @@ line-height: 50px; text-transform: lowercase; padding-left: 2px; - width: 612px - 2px - 400px; + width: 612px - 2px - 500px; .amp { font-style: italic; @@ -133,7 +133,7 @@ text-align: right; text-transform: lowercase; padding-right: 2px; - width: 400px - 2px; + width: 500px - 2px; float: left; .sep { @@ -294,6 +294,31 @@ margin-bottom: 25px; margin-right: 25px; } + .photo-gallery-link { + display: inline-block; + position: relative; + width: 200px; + height: 200px; + margin-right: 1px; + // border: 1px solid black; + + img { + display: block; + margin: 0px; + border: none; + } + .caption { + width: 202px; + background: rgba(0, 0, 0, 0.6); + text-align: center; + color: white; + padding: 5px 0px 0px; + + position: absolute; + left: 0px; + bottom: 10px; + } + } nav#TableOfContents { ul { list-style: none; diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1070981.jpg Binary file static/media/images/photography/photos/plants/_1070981.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080113.jpg Binary file static/media/images/photography/photos/plants/_1080113.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080128.jpg Binary file static/media/images/photography/photos/plants/_1080128.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080145.jpg Binary file static/media/images/photography/photos/plants/_1080145.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080199.jpg Binary file static/media/images/photography/photos/plants/_1080199.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080200.jpg Binary file static/media/images/photography/photos/plants/_1080200.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080214.jpg Binary file static/media/images/photography/photos/plants/_1080214.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080235.jpg Binary file static/media/images/photography/photos/plants/_1080235.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080241.jpg Binary file static/media/images/photography/photos/plants/_1080241.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1080957.jpg Binary file static/media/images/photography/photos/plants/_1080957.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1090014.jpg Binary file static/media/images/photography/photos/plants/_1090014.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/photos/plants/_1090038.jpg Binary file static/media/images/photography/photos/plants/_1090038.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1070981.jpg Binary file static/media/images/photography/thumbnails/plants/_1070981.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080113.jpg Binary file static/media/images/photography/thumbnails/plants/_1080113.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080128.jpg Binary file static/media/images/photography/thumbnails/plants/_1080128.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080145.jpg Binary file static/media/images/photography/thumbnails/plants/_1080145.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080199.jpg Binary file static/media/images/photography/thumbnails/plants/_1080199.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080200.jpg Binary file static/media/images/photography/thumbnails/plants/_1080200.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080214.jpg Binary file static/media/images/photography/thumbnails/plants/_1080214.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080235.jpg Binary file static/media/images/photography/thumbnails/plants/_1080235.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080241.jpg Binary file static/media/images/photography/thumbnails/plants/_1080241.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1080957.jpg Binary file static/media/images/photography/thumbnails/plants/_1080957.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1090014.jpg Binary file static/media/images/photography/thumbnails/plants/_1090014.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e static/media/images/photography/thumbnails/plants/_1090038.jpg Binary file static/media/images/photography/thumbnails/plants/_1090038.jpg has changed diff -r 88e1e358f431 -r 6e60d0b96c6e themes/stevelosh/layouts/partials/header.html --- a/themes/stevelosh/layouts/partials/header.html Tue Apr 11 16:25:00 2017 +0000 +++ b/themes/stevelosh/layouts/partials/header.html Mon Jul 31 18:11:31 2017 -0400 @@ -66,6 +66,8 @@ - Projects - + Photography + - Links - About