From 64b106da718a103c98ab7fe9f066bbf7f49d1982 Mon Sep 17 00:00:00 2001 From: Nathan Bergey Date: Sat, 30 Jan 2016 23:35:16 -0700 Subject: [PATCH] capture production of dev for working locally or on a server --- Makefile | 3 +++ _layouts/base.html | 6 ++++-- assets/style.sass | 14 ++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ca0783b..40a8455 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ all: favicon.ico + JEKYLL_ENV=production jekyll build + +dev: jekyll build favicon.ico: favicon.svg diff --git a/_layouts/base.html b/_layouts/base.html index 80061da..a6be443 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -4,8 +4,10 @@ - - + + {% capture caching %}{% if jekyll.environment == "production" %}.{{ site.time | date: '%s' }}{% else %}{% endif %}{% endcapture %} + + {{ page.title }} diff --git a/assets/style.sass b/assets/style.sass index 9fc495b..8c1a0bf 100644 --- a/assets/style.sass +++ b/assets/style.sass @@ -1,6 +1,8 @@ --- --- +{% capture caching %}{% if jekyll.environment == "production" %}.{{ site.time | date: '%s' }}{% else %}{% endif %}{% endcapture %} + $linkcolor: #3765D4 $primary: #F18BD1 @@ -8,22 +10,22 @@ $primary: #F18BD1 @font-face font-family: 'League Spartan' - src: url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.{{ site.time | date: '%s' }}.eot') - src: url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.{{ site.time | date: '%s' }}.eot?#iefix') format('embedded-opentype'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.{{ site.time | date: '%s' }}.woff2') format('woff2'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.{{ site.time | date: '%s' }}.woff') format('woff'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.{{ site.time | date: '%s' }}.ttf') format('truetype'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.{{ site.time | date: '%s' }}.svg#league_spartanbold') format('svg') + src: url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold{{ caching }}.eot') + src: url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold{{ caching }}.eot?#iefix') format('embedded-opentype'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold{{ caching }}.woff2') format('woff2'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold{{ caching }}.woff') format('woff'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold{{ caching }}.ttf') format('truetype'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold{{ caching }}.svg#league_spartanbold') format('svg') font-weight: bold font-style: normal @font-face font-family: 'Sorts Mill Goudy' - src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.{{ site.time | date: '%s' }}.eot') - src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.{{ site.time | date: '%s' }}.woff') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.{{ site.time | date: '%s' }}.ttf') format('truetype'), url('/assets/fonts/sorts-mill-goudy/webfontsGoudyStM-webfont.{{ site.time | date: '%s' }}.svg') format('svg') + src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont{{ caching }}.eot') + src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont{{ caching }}.woff') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont{{ caching }}.ttf') format('truetype'), url('/assets/fonts/sorts-mill-goudy/webfontsGoudyStM-webfont{{ caching }}.svg') format('svg') font-weight: 400 font-style: normal @font-face font-family: 'Sorts Mill Goudy' - src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.{{ site.time | date: '%s' }}.eot') - src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.{{ site.time | date: '%s' }}.woff') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.{{ site.time | date: '%s' }}.ttf') format('truetype'), url('/assets/fonts/sorts-mill-goudy/webfontsGoudyStM-Italic-webfont.{{ site.time | date: '%s' }}.svg') format('svg') + src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont{{ caching }}.eot') + src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont{{ caching }}.woff') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont{{ caching }}.ttf') format('truetype'), url('/assets/fonts/sorts-mill-goudy/webfontsGoudyStM-Italic-webfont{{ caching }}.svg') format('svg') font-weight: 400 font-style: italic