diff --git a/Gruntfile.js b/Gruntfile.js index 5be36f82..88f7b098 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -37,16 +37,8 @@ module.exports = function(grunt){ // Jekyll jekyll: { - options: { - - }, - production : { - // options: { -// lsi: true -// } - src: '<%= config.src %>/' - }, - serve: { + production: { + lsi: true, src: '<%= config.src %>/' } }, @@ -165,7 +157,7 @@ module.exports = function(grunt){ '<%= config.src %>/_layouts/**', '<%= config.src %>/_posts/**' ], - tasks: ['jekyll:serve', 'less', 'uglify'] + tasks: ['jekyll', 'less', 'uglify'] }, }, @@ -178,8 +170,9 @@ module.exports = function(grunt){ copy_media: { options: { src: '<%= config.src %>/_media/', - dest: '<%= config.site %>/media/', - args: ["--exclude='gen'"] + dest: '<%= config.site %>/media', + exclude: ['**/gen'], + syncDestIgnoreExcl: true } }, // deployment @@ -187,7 +180,7 @@ module.exports = function(grunt){ options: { syncDest: true, src: '<%= config.site %>/', - dest: 'domains/kremalicious.com/html/', + dest: 'domains/kremalicious.com/html', host: 'kremalicious', ssh: true, args: ['--verbose'], @@ -218,7 +211,7 @@ module.exports = function(grunt){ // Dev server grunt.registerTask('server', [ 'rsync:copy_media', - 'jekyll:serve', + 'jekyll', 'less', 'cmq', 'cssmin', @@ -236,7 +229,7 @@ module.exports = function(grunt){ grunt.registerTask('build', [ 'clean', 'rsync:copy_media', - 'jekyll:production', + 'jekyll', //'imagemin', 'less', 'cmq', diff --git a/_src/_includes/index.html b/_src/_includes/index.html new file mode 100644 index 00000000..50985f69 --- /dev/null +++ b/_src/_includes/index.html @@ -0,0 +1,64 @@ + +{% if post.layout == "link" %} + +
+
+

+ {{ post.title }} +

+
+ +
+ {{ post.content }} +

+ Go to source + ∞ +

+
+
+ +{% elsif post.layout == "photo" %} + +
+ + +
+ + {% picture {{ post.image }} %} + +
{{ post.title }}
+ exif +
+ + +
+ +{% else %} + +
+
+

{{ post.title }}

+
+ +
+ + {% if post.image %} + + {% picture {{ post.image }} class="teaser" %} + + {% endif %} + + {% capture has_more %}{{ post.content | has_more }}{% endcapture %} + + {% if has_more == 'true' %} + {{ post.content | post.excerpt | excerpt }} + {% else %} + {{ post.excerpt }} + {% endif %} + + Continue reading + +
+
+ +{% endif %} diff --git a/_src/_includes/paginator.html b/_src/_includes/paginator.html new file mode 100644 index 00000000..534894b4 --- /dev/null +++ b/_src/_includes/paginator.html @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/_src/_includes/related_posts.html b/_src/_includes/related_posts.html new file mode 100644 index 00000000..fa363744 --- /dev/null +++ b/_src/_includes/related_posts.html @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/_src/_layouts/link.html b/_src/_layouts/link.html index 879be1c4..1fa6b365 100644 --- a/_src/_layouts/link.html +++ b/_src/_layouts/link.html @@ -2,7 +2,7 @@ layout: base --- -
+
@@ -30,4 +30,6 @@ layout: base
-
\ No newline at end of file +
+ +{% include related_posts.html %} \ No newline at end of file diff --git a/_src/_layouts/image.html b/_src/_layouts/photo.html similarity index 90% rename from _src/_layouts/image.html rename to _src/_layouts/photo.html index a31e551e..00ebd26e 100644 --- a/_src/_layouts/image.html +++ b/_src/_layouts/photo.html @@ -2,7 +2,7 @@ layout: base --- -
+
@@ -32,4 +32,6 @@ layout: base
-
\ No newline at end of file +
+ +{% include related_posts.html %} \ No newline at end of file diff --git a/_src/_layouts/post.html b/_src/_layouts/post.html index 773b3b66..e930f7f9 100644 --- a/_src/_layouts/post.html +++ b/_src/_layouts/post.html @@ -2,7 +2,7 @@ layout: base --- -
+
@@ -33,4 +33,6 @@ layout: base
-
\ No newline at end of file +
+ +{% include related_posts.html %} \ No newline at end of file diff --git a/_src/_posts/2008-09-23-a-long-time-ago.markdown b/_src/_posts/2008-09-23-a-long-time-ago.markdown index cf39da60..9a6d6c96 100644 --- a/_src/_posts/2008-09-23-a-long-time-ago.markdown +++ b/_src/_posts/2008-09-23-a-long-time-ago.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: A Long Time Ago... image: A-Long-Time-Ago.jpg diff --git a/_src/_posts/2010-03-27-office-desk.markdown b/_src/_posts/2010-03-27-office-desk.markdown index b86c8adb..1c24be05 100644 --- a/_src/_posts/2010-03-27-office-desk.markdown +++ b/_src/_posts/2010-03-27-office-desk.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Office Desk image: Office-Desk.jpg diff --git a/_src/_posts/2010-07-18-typeface-condoms.markdown b/_src/_posts/2010-07-18-typeface-condoms.markdown index 63d7b629..b9484314 100644 --- a/_src/_posts/2010-07-18-typeface-condoms.markdown +++ b/_src/_posts/2010-07-18-typeface-condoms.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Typeface condoms image: Typeface-condoms.jpg diff --git a/_src/_posts/2010-08-07-bonsai.markdown b/_src/_posts/2010-08-07-bonsai.markdown index ba5752f6..2256cd42 100644 --- a/_src/_posts/2010-08-07-bonsai.markdown +++ b/_src/_posts/2010-08-07-bonsai.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Bonsai image: Bonsai-5-Version-2.jpg diff --git a/_src/_posts/2010-09-01-gdr-helvetica.markdown b/_src/_posts/2010-09-01-gdr-helvetica.markdown index 15d8b8ef..0a38a693 100644 --- a/_src/_posts/2010-09-01-gdr-helvetica.markdown +++ b/_src/_posts/2010-09-01-gdr-helvetica.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: GDR Helvetica image: GDR-Helvetica.jpg diff --git a/_src/_posts/2010-12-11-iphone-coasters.markdown b/_src/_posts/2010-12-11-iphone-coasters.markdown index 4f68dab9..3680f8ec 100644 --- a/_src/_posts/2010-12-11-iphone-coasters.markdown +++ b/_src/_posts/2010-12-11-iphone-coasters.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: iPhone Coasters image: iPhone-Coasters-1-Version-2.jpg diff --git a/_src/_posts/2010-12-29-basically-the-monolith-is-on-my-desk.markdown b/_src/_posts/2010-12-29-basically-the-monolith-is-on-my-desk.markdown index ff10f9d8..1a1ceb3a 100644 --- a/_src/_posts/2010-12-29-basically-the-monolith-is-on-my-desk.markdown +++ b/_src/_posts/2010-12-29-basically-the-monolith-is-on-my-desk.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Basically, The Monolith Is On My Desk image: Basically-The-Monolith-Is-On-My-Desk.jpg diff --git a/_src/_posts/2010-12-29-free-monkey-breath-not-soylent-green.markdown b/_src/_posts/2010-12-29-free-monkey-breath-not-soylent-green.markdown index 35f45e74..a02bb3c5 100644 --- a/_src/_posts/2010-12-29-free-monkey-breath-not-soylent-green.markdown +++ b/_src/_posts/2010-12-29-free-monkey-breath-not-soylent-green.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Free Monkey Breath, Not Soylent Green image: Free-Monkey-Breath-Not-Soylent-Green.jpg diff --git a/_src/_posts/2011-01-08-enjoying-paper.markdown b/_src/_posts/2011-01-08-enjoying-paper.markdown index 023e2631..e6adaf9d 100644 --- a/_src/_posts/2011-01-08-enjoying-paper.markdown +++ b/_src/_posts/2011-01-08-enjoying-paper.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Enjoying Paper image: Enjoying-Paper.jpg diff --git a/_src/_posts/2011-01-08-glowing-star-inside.markdown b/_src/_posts/2011-01-08-glowing-star-inside.markdown index 3b9b5652..91fc38e7 100644 --- a/_src/_posts/2011-01-08-glowing-star-inside.markdown +++ b/_src/_posts/2011-01-08-glowing-star-inside.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Glowing Star Inside image: Glowing-Star-Inside.jpg diff --git a/_src/_posts/2011-01-18-historic-flood-levels.markdown b/_src/_posts/2011-01-18-historic-flood-levels.markdown index 59530743..76d1ef45 100644 --- a/_src/_posts/2011-01-18-historic-flood-levels.markdown +++ b/_src/_posts/2011-01-18-historic-flood-levels.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Historic Flood Levels image: Historic-Flood-Levels.jpg diff --git a/_src/_posts/2011-10-11-broken-nexus-s-screen.markdown b/_src/_posts/2011-10-11-broken-nexus-s-screen.markdown index c8f1dd73..f873ecaa 100644 --- a/_src/_posts/2011-10-11-broken-nexus-s-screen.markdown +++ b/_src/_posts/2011-10-11-broken-nexus-s-screen.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Broken Nexus S Screen image: Broken-Nexus-S-Screen.jpg diff --git a/_src/_posts/2012-03-04-relaxing-cat.markdown b/_src/_posts/2012-03-04-relaxing-cat.markdown index 19a07b84..2782b4be 100644 --- a/_src/_posts/2012-03-04-relaxing-cat.markdown +++ b/_src/_posts/2012-03-04-relaxing-cat.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Relaxing Cat image: 7f9397a265d811e1b9f1123138140926_7.jpg diff --git a/_src/_posts/2012-04-03-blaue-turme.markdown b/_src/_posts/2012-04-03-blaue-turme.markdown index bd2162f8..cdea4fc4 100644 --- a/_src/_posts/2012-04-03-blaue-turme.markdown +++ b/_src/_posts/2012-04-03-blaue-turme.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Blaue Türme image: Blaue-Türme-1.jpg diff --git a/_src/_posts/2012-04-03-skeletor.markdown b/_src/_posts/2012-04-03-skeletor.markdown index 184f2e28..38184305 100644 --- a/_src/_posts/2012-04-03-skeletor.markdown +++ b/_src/_posts/2012-04-03-skeletor.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Skeletor image: 6313cc1e7db611e180c9123138016265_7.jpg diff --git a/_src/_posts/2012-04-03-train-station-leipzig.markdown b/_src/_posts/2012-04-03-train-station-leipzig.markdown index 7109fa85..6ced8dae 100644 --- a/_src/_posts/2012-04-03-train-station-leipzig.markdown +++ b/_src/_posts/2012-04-03-train-station-leipzig.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Train Station Leipzig image: de2ac24c7db911e1b9f1123138140926_7.jpg diff --git a/_src/_posts/2012-04-05-current-sushi-status.markdown b/_src/_posts/2012-04-05-current-sushi-status.markdown index 4d11842e..d3803f28 100644 --- a/_src/_posts/2012-04-05-current-sushi-status.markdown +++ b/_src/_posts/2012-04-05-current-sushi-status.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Current Sushi Status image: aff38e2c7f5311e1b10e123138105d6b_7.jpg diff --git a/_src/_posts/2012-04-07-buna.markdown b/_src/_posts/2012-04-07-buna.markdown index 44312c2d..0f3c5e59 100644 --- a/_src/_posts/2012-04-07-buna.markdown +++ b/_src/_posts/2012-04-07-buna.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Buna image: 44af28f2805b11e18cf91231380fd29b_7.jpg diff --git a/_src/_posts/2012-04-07-cat-enjoying-a-good-ipad-game.markdown b/_src/_posts/2012-04-07-cat-enjoying-a-good-ipad-game.markdown index 76df8108..a67fe1a4 100644 --- a/_src/_posts/2012-04-07-cat-enjoying-a-good-ipad-game.markdown +++ b/_src/_posts/2012-04-07-cat-enjoying-a-good-ipad-game.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Cat enjoying a good iPad game image: 7838011c80ce11e19e4a12313813ffc0_7.jpg diff --git a/_src/_posts/2012-04-07-ipad-porn.markdown b/_src/_posts/2012-04-07-ipad-porn.markdown index e0679d86..af479cab 100644 --- a/_src/_posts/2012-04-07-ipad-porn.markdown +++ b/_src/_posts/2012-04-07-ipad-porn.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: iPad Porn image: 97a44d6080b711e181bd12313817987b_7.jpg diff --git a/_src/_posts/2012-04-07-opera.markdown b/_src/_posts/2012-04-07-opera.markdown index 061da2a3..0ccc1cb2 100644 --- a/_src/_posts/2012-04-07-opera.markdown +++ b/_src/_posts/2012-04-07-opera.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Opera image: 5df6e0a280c911e1a87612313804ec91_7.jpg diff --git a/_src/_posts/2012-04-08-common-kitchen-decoration.markdown b/_src/_posts/2012-04-08-common-kitchen-decoration.markdown index bf998a48..7b87df64 100644 --- a/_src/_posts/2012-04-08-common-kitchen-decoration.markdown +++ b/_src/_posts/2012-04-08-common-kitchen-decoration.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Common kitchen decoration image: 2ba6eeba81b111e1989612313815112c_7.jpg diff --git a/_src/_posts/2012-04-08-graffiti-old-school-style.markdown b/_src/_posts/2012-04-08-graffiti-old-school-style.markdown index a7f36ff9..a1da2257 100644 --- a/_src/_posts/2012-04-08-graffiti-old-school-style.markdown +++ b/_src/_posts/2012-04-08-graffiti-old-school-style.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Graffiti, old school style image: 7e2b28f881b711e1af7612313813f8e8_7.jpg diff --git a/_src/_posts/2012-05-03-antique-chrome.markdown b/_src/_posts/2012-05-03-antique-chrome.markdown index 67077693..32b77c1a 100644 --- a/_src/_posts/2012-05-03-antique-chrome.markdown +++ b/_src/_posts/2012-05-03-antique-chrome.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Antique Chrome image: 5fc688aa953811e180c9123138016265_7.jpg diff --git a/_src/_posts/2012-05-23-like-modern-heating-only-more-badass.markdown b/_src/_posts/2012-05-23-like-modern-heating-only-more-badass.markdown index 8559fb32..599a6188 100644 --- a/_src/_posts/2012-05-23-like-modern-heating-only-more-badass.markdown +++ b/_src/_posts/2012-05-23-like-modern-heating-only-more-badass.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Like modern heating only more badass image: 41b5a454a43811e1989612313815112c_7.jpeg diff --git a/_src/_posts/2012-05-27-balloon.markdown b/_src/_posts/2012-05-27-balloon.markdown index 041b0735..f82a7e4d 100644 --- a/_src/_posts/2012-05-27-balloon.markdown +++ b/_src/_posts/2012-05-27-balloon.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Balloon image: 690fe368a81911e1b2fe1231380205bf_7.jpg diff --git a/_src/_posts/2012-06-27-typography-window.markdown b/_src/_posts/2012-06-27-typography-window.markdown index ea294b25..b7109b69 100644 --- a/_src/_posts/2012-06-27-typography-window.markdown +++ b/_src/_posts/2012-06-27-typography-window.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Typography window image: 80a136dabff711e188131231381b5c25_7.jpg diff --git a/_src/_posts/2012-07-20-mmmmh-coffee.markdown b/_src/_posts/2012-07-20-mmmmh-coffee.markdown index 849861b2..f88626e9 100644 --- a/_src/_posts/2012-07-20-mmmmh-coffee.markdown +++ b/_src/_posts/2012-07-20-mmmmh-coffee.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Mmmmh, Coffee image: 66a6e0c0d25a11e1a94522000a1e8aaf_7.jpg diff --git a/_src/_posts/2012-08-08-amazingly-early.markdown b/_src/_posts/2012-08-08-amazingly-early.markdown index 389a85d9..d277d5b6 100644 --- a/_src/_posts/2012-08-08-amazingly-early.markdown +++ b/_src/_posts/2012-08-08-amazingly-early.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Amazingly early image: 2ca7a094e10f11e1868c12313817a130_7.jpg diff --git a/_src/_posts/2012-08-25-so-much-room.markdown b/_src/_posts/2012-08-25-so-much-room.markdown index bec09724..7fd7331c 100644 --- a/_src/_posts/2012-08-25-so-much-room.markdown +++ b/_src/_posts/2012-08-25-so-much-room.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: So much room image: c0c45b6eeea211e1ad8e22000a1cdbb8_7.jpg diff --git a/_src/_posts/2012-09-07-huge-station-is-huge.markdown b/_src/_posts/2012-09-07-huge-station-is-huge.markdown index ad45bc49..42416ed2 100644 --- a/_src/_posts/2012-09-07-huge-station-is-huge.markdown +++ b/_src/_posts/2012-09-07-huge-station-is-huge.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Huge station is huge image: 619b3900f92911e1a31922000a1cddf1_7.jpg diff --git a/_src/_posts/2012-09-10-subway-firefox.markdown b/_src/_posts/2012-09-10-subway-firefox.markdown index 4a73292c..84227f25 100644 --- a/_src/_posts/2012-09-10-subway-firefox.markdown +++ b/_src/_posts/2012-09-10-subway-firefox.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Subway Firefox image: 84f9d2c4fb7411e19ca422000a1d0119_7.jpg diff --git a/_src/_posts/2012-09-12-sweet-typography.markdown b/_src/_posts/2012-09-12-sweet-typography.markdown index 7cf61068..b542055f 100644 --- a/_src/_posts/2012-09-12-sweet-typography.markdown +++ b/_src/_posts/2012-09-12-sweet-typography.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Sweet typography image: 01f8b0b8fcc611e19b5b123138140bce_7.jpg diff --git a/_src/_posts/2012-09-14-bvg-dos.markdown b/_src/_posts/2012-09-14-bvg-dos.markdown index f1582465..c85e0e34 100644 --- a/_src/_posts/2012-09-14-bvg-dos.markdown +++ b/_src/_posts/2012-09-14-bvg-dos.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: BVG DOS image: 6c4003f2fe9911e1ae9122000a1e9e21_7.jpg diff --git a/_src/_posts/2013-02-17-castle-garden.markdown b/_src/_posts/2013-02-17-castle-garden.markdown index 36d35e1a..aecce5c6 100644 --- a/_src/_posts/2013-02-17-castle-garden.markdown +++ b/_src/_posts/2013-02-17-castle-garden.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: Castle Garden image: 8372983659_da0e88ca79_o.jpg diff --git a/_src/_posts/2013-02-17-ezeep-android-app-design.markdown b/_src/_posts/2013-02-17-ezeep-android-app-design.markdown index 5742bc1e..1b9ae87b 100644 --- a/_src/_posts/2013-02-17-ezeep-android-app-design.markdown +++ b/_src/_posts/2013-02-17-ezeep-android-app-design.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: ezeep Android App Design image: 8455835942_a9b9100373_o.jpg diff --git a/_src/_posts/2013-02-17-ezeep-office-view.markdown b/_src/_posts/2013-02-17-ezeep-office-view.markdown index bdadfba1..31f779b1 100644 --- a/_src/_posts/2013-02-17-ezeep-office-view.markdown +++ b/_src/_posts/2013-02-17-ezeep-office-view.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: ezeep office view image: 8450618380_83c64006c6_o.jpg diff --git a/_src/_posts/2013-05-23-ezeep-birds.markdown b/_src/_posts/2013-05-23-ezeep-birds.markdown index f9cd43ea..9339da8a 100644 --- a/_src/_posts/2013-05-23-ezeep-birds.markdown +++ b/_src/_posts/2013-05-23-ezeep-birds.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: ezeep birds image: 8776417095_43553c88c2_o.jpg diff --git a/_src/_posts/2013-05-23-ezeep-origami.markdown b/_src/_posts/2013-05-23-ezeep-origami.markdown index 0fa61d70..f9200235 100644 --- a/_src/_posts/2013-05-23-ezeep-origami.markdown +++ b/_src/_posts/2013-05-23-ezeep-origami.markdown @@ -1,5 +1,5 @@ --- -layout: image +layout: photo title: ezeep origami image: 8782995066_e90ff6b3ae_o.jpg diff --git a/_src/archive.html b/_src/archive.html new file mode 100644 index 00000000..cd978c2c --- /dev/null +++ b/_src/archive.html @@ -0,0 +1,20 @@ +--- +layout: base +title: Archive +--- + +
+ +

Archive

+ + {% for post in site.posts %} + +
+
+

{{ post.title }}

+
+
+ + {% endfor %} + +
\ No newline at end of file diff --git a/_src/assets/js/app.js b/_src/assets/js/app.js index 43ca83a8..57bea56b 100644 --- a/_src/assets/js/app.js +++ b/_src/assets/js/app.js @@ -41,7 +41,7 @@ var photoGrid = { init: function(){ // only fire when photo post present and screen bigger than 480px - if ( $('#main .masonry').length > 0 && Modernizr.mq('only screen and (min-width: 480px)') ) { + if ( $('#photos').length > 0 ) { this.masonryLayout(); } } @@ -66,7 +66,7 @@ var infiniteScroll = { infiniteScrollSetup: function() { - if ( $('body.archive.category-photos').length > 0 ) { + if ( $('#photos').length > 0 ) { var items = '#main .masonry'; } else { var items = '#main article.hentry'; diff --git a/_src/assets/less/content.less b/_src/assets/less/content.less index 50fcd5cb..0373f9e7 100644 --- a/_src/assets/less/content.less +++ b/_src/assets/less/content.less @@ -3,12 +3,16 @@ padding: @line-height-computed*2 0; @media @breakpoint2 { - padding: (@line-height-computed * 4) 0; + padding: @line-height-computed*4 0; } &:first-child { padding-top: @line-height-computed; } + + .page-single & { + padding-bottom: @line-height-computed + } } // post title @@ -64,6 +68,79 @@ } } + +// LINK POST +///////////////////////////////////// + +.hentry.format-link { + +} + +.permalink-link { + float: right; +} + +// PHOTO POST +///////////////////////////////////// + +.hentry.format-image { + text-align: center; + + figure { + display: inline-block; + margin-left: auto; + margin-right: auto; + position: relative; + padding: .4em; + background: #fcfeff; + border: 1px solid rgba(158, 170, 178, .6); + border-radius: 2px; + .box-shadow(0 1px 4px rgba(0, 0, 0, 0.1)); + .transition(); + + @media @breakpoint2 { + .box-shadow(~"0 1px 4px rgba(0, 0, 0, 0.1), inset 0 0 30px rgba(0, 0, 0, 0.1), inset 0 1px 0 #fff"); + } + + img { + .box-shadow(none); + border-radius: 2px; + margin-left: auto; + margin-right: auto; + margin-bottom: 1em; + } + + figcaption { + text-align: center; + margin-bottom: .5em; + color: rgba(46, 79, 92, .7); + font-family: @headings-font-family; + font-weight: @headings-font-weight; + font-style: normal; + font-size: .9em + } + } +} + +a.photoPost { + display: block; + + &:hover { + figure { background: #c4e4df; } + } +} + +#exif { + font-size: @font-size-small; + color: #b9c3c9; + text-align: center; + margin-bottom: .5em; + + span { + margin-right: 1em; + } +} + // POST META ///////////////////////////////////// @@ -113,113 +190,48 @@ } -// LINK POST -///////////////////////////////////// - -.permalink-link { - float: right; +// +// Related posts +// +.related-title { + .h5; + color: @text-color-dimmed; + text-align: center; + margin-top: 0; + margin-bottom: @line-height-computed; } -// GOODIES POST -///////////////////////////////////// - -#goodiesDownload { - margin: 1em 0 0 0; - - p { - margin-bottom: 1em; - } - - .btn { - display: block; - margin-bottom: 0; - - &:before { - margin-right: .5em; - } - } +.related-posts { + &:hover .post-title { + color: @text-color; + } } - - -// PHOTO POST -///////////////////////////////////// - -.hentry.format-image { - text-align: center -} - -.photoPost { - display: block; - figure { - display: inline-block; - margin-left: auto; - margin-right: auto; - position: relative; - padding: .4em; - background: #fcfeff; - border: 1px solid rgba(158, 170, 178, .6); - border-radius: 2px; - .box-shadow(0 1px 4px rgba(0, 0, 0, 0.1)); - .transition(); +.related-post { + text-align: center; - @media @breakpoint2 { - .box-shadow(~"0 1px 4px rgba(0, 0, 0, 0.1), inset 0 0 30px rgba(0, 0, 0, 0.1), inset 0 1px 0 #fff"); - } - - img { - .box-shadow(none); - border-radius: 2px; - margin-left: auto; - margin-right: auto; - margin-bottom: 1em; - } - - figcaption { - text-align: center; - margin-bottom: .5em; - color: rgba(46, 79, 92, .7); - font-family: @headings-font-family; - font-weight: @headings-font-weight; - font-style: normal; - font-size: .9em - } + .post-title { + font-size: .9em; + color: @text-color-light; + line-height: @line-height-base; + margin-top: 0; + margin-bottom: @line-height-computed; + .transition; } - // Single View - .single & { - text-align: center; - figure { margin-bottom: 1.5em; } + a { + display: block; - // show big size on larger screens - @media @breakpoint3 { - margin-left: -7em; - margin-right: -7em; - } + &:hover .post-title { color: @link-color-hover } } } -a.photoPost { - - &:hover { - figure { background: #c4e4df; } - } -} -#exif { - font-size: @font-size-small; - color: #b9c3c9; - text-align: center; - margin-bottom: .5em; - span { - margin-right: 1em; - } -} // Masonry -.masonryWrap { +.masonry { @media @breakpoint2 { width: 125%; @@ -258,24 +270,6 @@ a.photoPost { } } -@media @breakpoint2 { - - #goodiesDownload p { - width: 49%; - float: left; - margin-left: 2%; - &:first-child { - margin-left: 0; - } - } - - .btn.btn-block.col2 { width: 30%; float: left; } - .btn.btn-block.col4, - .btn.btn-primary.col4 { width: 65%; float: left; } - -} - - // TABLES ///////////////////////////////////// diff --git a/_src/assets/less/grid.less b/_src/assets/less/grid.less index c4f9287b..a905de48 100644 --- a/_src/assets/less/grid.less +++ b/_src/assets/less/grid.less @@ -62,7 +62,13 @@ .col3:first-child, .col4:first-child, .col5:first-child, - .col6 { margin-left: 0; } + .col6, + .col3:nth-child(2n+3), + .col2:nth-child(3n+4), + .col1:nth-child(6n+7) { + margin-left: 0; + clear: both + } .col1 { width: 13%; } .col2 { width: 30.6%; } diff --git a/_src/index.html b/_src/index.html index 24eb9fc8..1fb16098 100644 --- a/_src/index.html +++ b/_src/index.html @@ -12,93 +12,10 @@ description: 'Blog of designer & developer Matthias Kretschmann' {% for post in paginator.posts %} - {% if post.layout == "link" %} - -
-
-

- {{ post.title }} -

-
- -
- {{ post.content }} -

- Go to source - ∞ -

-
-
- - {% elsif post.layout == "image" %} - -
- - -
- - {% picture {{ post.image }} %} - -
{{ post.title }}
- exif -
- - -
- - {% else %} - -
-
-

{{ post.title }}

-
- -
- - {% if post.image %} - - {% picture {{ post.image }} class="teaser" %} - - {% endif %} - - {% capture has_more %}{{ post.content | has_more }}{% endcapture %} - - {% if has_more == 'true' %} - {{ post.content | post.excerpt | excerpt }} - {% else %} - {{ post.excerpt }} - {% endif %} - - Continue reading - -
-
- - {% endif %} + {% include index.html %} {% endfor %} - +{% include paginator.html %} \ No newline at end of file diff --git a/_src/photos.html b/_src/photos.html new file mode 100644 index 00000000..99b397de --- /dev/null +++ b/_src/photos.html @@ -0,0 +1,28 @@ +--- +layout: base +title: Photos kremalicious +--- + +
+
+ + {% for post in site.categories.photos %} + + + + {% endfor %} + +
+
\ No newline at end of file