From 2ecd83122bb512c817a5e835a0a432d9ad392733 Mon Sep 17 00:00:00 2001
From: Ben Burwell <ben@benburwell.com>
Date: Mon, 11 May 2015 16:45:11 -0400
Subject: switch from Crimson Text to Merriweather

---
 _includes/fonts.scss | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to '_includes')

diff --git a/_includes/fonts.scss b/_includes/fonts.scss
index 58cc0d2..e23018e 100644
--- a/_includes/fonts.scss
+++ b/_includes/fonts.scss
@@ -1,3 +1,4 @@
+// Open Sans
 @font-face {
     font-family: 'open_sans';
     src: url('/assets/fonts/OpenSans-Light.eot');
@@ -7,29 +8,33 @@
     font-style: normal;
 }
 
+// Source Code Pro
 @font-face {
-    font-family: 'crimson_text';
-    src: url('/assets/fonts/crimsontext-regular.eot');
-    src: url('/assets/fonts/crimsontext-regular.woff') format('woff'),
-        url('/assets/fonts/crimsontext-regular.ttf') format('truetype');
+    font-family: 'source_code_pro';
+    src: url('/assets/fonts/sourcecodepro-regular.eot');
+    src: url('/assets/fonts/sourcecodepro-regular.woff') format('woff'),
+        url('/assets/fonts/sourcecodepro-regular.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
 
+// Merriweather
 @font-face {
-    font-family: 'crimson_text';
-    src: url('/assets/fonts/crimsontext-italic.eot');
-    src: url('/assets/fonts/crimsontext-italic.woff') format('woff'),
-        url('/assets/fonts/crimsontext-italic.ttf') format('truetype');
+    font-family: 'merriweather';
+    src: url('/assets/fonts/merriweather-italic-webfont.eot');
+    src: url('/assets/fonts/merriweather-italic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/assets/fonts/merriweather-italic-webfont.woff') format('woff'),
+         url('/assets/fonts/merriweather-italic-webfont.ttf') format('truetype');
     font-weight: normal;
     font-style: italic;
 }
 
 @font-face {
-    font-family: 'source_code_pro';
-    src: url('/assets/fonts/sourcecodepro-regular.eot');
-    src: url('/assets/fonts/sourcecodepro-regular.woff') format('woff'),
-        url('/assets/fonts/sourcecodepro-regular.ttf') format('truetype');
+    font-family: 'merriweather';
+    src: url('/assets/fonts/merriweather-regular-webfont.eot');
+    src: url('/assets/fonts/merriweather-regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/assets/fonts/merriweather-regular-webfont.woff') format('woff'),
+         url('/assets/fonts/merriweather-regular-webfont.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3