From 1bc06b95c6644b37e7ab9220a9c20322bafe79e3 Mon Sep 17 00:00:00 2001
From: Nathan Bergey <nathan.bergey@gmail.com>
Date: Thu, 28 Jan 2016 21:52:35 -0700
Subject: [PATCH] simplify the style to one master file, put create tags on
 everything for far future expires

---
 _layouts/base.html |  1 +
 assets/style.sass  | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/_layouts/base.html b/_layouts/base.html
index 436e232..2f977fb 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="natronics.org">
+    <link rel="shortcut icon" href="/favicon.ico?{{ site.time | date: '%s' }}">
     <link rel="stylesheet" href="/assets/style.css?{{ site.time | date: '%s' }}">
     <title>{{ page.title }}</title>
   </head>
diff --git a/assets/style.sass b/assets/style.sass
index b1a65b1..42b30bc 100644
--- a/assets/style.sass
+++ b/assets/style.sass
@@ -5,19 +5,25 @@ $linkcolor: #3765D4
 $primary: #F18BD1
 
 @import _normalize
-@import /assets/fonts/league-spartan/_webfonts/stylesheet.css
+
+@font-face
+  font-family: 'League Spartan'
+  src: url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.eot?{{ site.time | date: '%s' }}')
+  src: url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.eot?#iefix&{{ site.time | date: '%s' }}') format('embedded-opentype'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.woff2?{{ site.time | date: '%s' }}') format('woff2'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.woff?{{ site.time | date: '%s' }}') format('woff'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.ttf?{{ site.time | date: '%s' }}') format('truetype'), url('/assets/fonts/league-spartan/_webfonts/leaguespartan-bold.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.eot')
-  src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.woff') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.ttf') format('truetype'), url('/assets/fonts/sorts-mill-goudy//webfontsGoudyStM-webfont.svg') format('svg')
+  src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.eot?{{ site.time | date: '%s' }}')
+  src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.woff?{{ site.time | date: '%s' }}') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-webfont.ttf?{{ site.time | date: '%s' }}') format('truetype'), url('/assets/fonts/sorts-mill-goudy//webfontsGoudyStM-webfont.svg?{{ site.time | date: '%s' }}') 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.eot')
-  src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.woff') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.ttf') format('truetype'), url('/assets/fonts/sorts-mill-goudy//webfontsGoudyStM-Italic-webfont.svg') format('svg')
+  src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.eot?{{ site.time | date: '%s' }}')
+  src: url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.woff?{{ site.time | date: '%s' }}') format('woff'), url('/assets/fonts/sorts-mill-goudy/webfonts/GoudyStM-Italic-webfont.ttf?{{ site.time | date: '%s' }}') format('truetype'), url('/assets/fonts/sorts-mill-goudy//webfontsGoudyStM-Italic-webfont.svg?{{ site.time | date: '%s' }}') format('svg')
   font-weight: 400
   font-style: italic