From 73bd29472664f3b9628913c623ce15030081a470 Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Mon, 11 May 2015 19:28:27 -0400 Subject: Change font from Merriweather Regular to Merriweather Light --- _includes/fonts.scss | 20 ++++++++++---------- _sass/_base.scss | 1 - _sass/_variables.scss | 2 +- assets/fonts/merriweather-italic-webfont.eot | Bin 28718 -> 0 bytes assets/fonts/merriweather-italic-webfont.ttf | Bin 59888 -> 0 bytes assets/fonts/merriweather-italic-webfont.woff | Bin 32868 -> 0 bytes assets/fonts/merriweather-lightitalic-webfont.eot | Bin 0 -> 29170 bytes assets/fonts/merriweather-lightitalic-webfont.ttf | Bin 0 -> 60484 bytes assets/fonts/merriweather-lightitalic-webfont.woff | Bin 0 -> 33320 bytes assets/fonts/merriweather-regular-webfont.eot | Bin 28208 -> 0 bytes assets/fonts/merriweather-regular-webfont.ttf | Bin 57656 -> 0 bytes assets/fonts/merriweather-regular-webfont.woff | Bin 31840 -> 0 bytes assets/fonts/merriweather_light-webfont.eot | Bin 0 -> 28224 bytes assets/fonts/merriweather_light-webfont.ttf | Bin 0 -> 57452 bytes assets/fonts/merriweather_light-webfont.woff | Bin 0 -> 31620 bytes 15 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 assets/fonts/merriweather-italic-webfont.eot delete mode 100644 assets/fonts/merriweather-italic-webfont.ttf delete mode 100644 assets/fonts/merriweather-italic-webfont.woff create mode 100644 assets/fonts/merriweather-lightitalic-webfont.eot create mode 100644 assets/fonts/merriweather-lightitalic-webfont.ttf create mode 100644 assets/fonts/merriweather-lightitalic-webfont.woff delete mode 100644 assets/fonts/merriweather-regular-webfont.eot delete mode 100644 assets/fonts/merriweather-regular-webfont.ttf delete mode 100644 assets/fonts/merriweather-regular-webfont.woff create mode 100644 assets/fonts/merriweather_light-webfont.eot create mode 100644 assets/fonts/merriweather_light-webfont.ttf create mode 100644 assets/fonts/merriweather_light-webfont.woff diff --git a/_includes/fonts.scss b/_includes/fonts.scss index e23018e..bff4b44 100644 --- a/_includes/fonts.scss +++ b/_includes/fonts.scss @@ -20,21 +20,21 @@ // Merriweather @font-face { - 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-family: 'merriweather_light'; + src: url('/assets/fonts/merriweather-lightitalic-webfont.eot'); + src: url('/assets/fonts/merriweather-lightitalic-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/merriweather-lightitalic-webfont.woff') format('woff'), + url('/assets/fonts/merriweather-lightitalic-webfont.ttf') format('truetype'); font-weight: normal; font-style: italic; } @font-face { - 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-family: 'merriweather_light'; + src: url('/assets/fonts/merriweather_light-webfont.eot'); + src: url('/assets/fonts/merriweather_light-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/merriweather_light-webfont.woff') format('woff'), + url('/assets/fonts/merriweather_light-webfont.ttf') format('truetype'); font-weight: normal; font-style: normal; } \ No newline at end of file diff --git a/_sass/_base.scss b/_sass/_base.scss index be84876..dc8d1fa 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -4,7 +4,6 @@ html { body { font-family: $serif; - font-weight: normal; font-size: 20px; margin: 0; padding: 0; diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 79edd32..267a722 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -7,5 +7,5 @@ $white: #fff; // Fonts $sans: 'open_sans', sans-serif; -$serif: 'merriweather', serif; +$serif: 'merriweather_light', serif; $monospace: 'source_code_pro', monospace; diff --git a/assets/fonts/merriweather-italic-webfont.eot b/assets/fonts/merriweather-italic-webfont.eot deleted file mode 100644 index 06c77b2..0000000 Binary files a/assets/fonts/merriweather-italic-webfont.eot and /dev/null differ diff --git a/assets/fonts/merriweather-italic-webfont.ttf b/assets/fonts/merriweather-italic-webfont.ttf deleted file mode 100644 index 6584562..0000000 Binary files a/assets/fonts/merriweather-italic-webfont.ttf and /dev/null differ diff --git a/assets/fonts/merriweather-italic-webfont.woff b/assets/fonts/merriweather-italic-webfont.woff deleted file mode 100644 index f01ac25..0000000 Binary files a/assets/fonts/merriweather-italic-webfont.woff and /dev/null differ diff --git a/assets/fonts/merriweather-lightitalic-webfont.eot b/assets/fonts/merriweather-lightitalic-webfont.eot new file mode 100644 index 0000000..a677e49 Binary files /dev/null and b/assets/fonts/merriweather-lightitalic-webfont.eot differ diff --git a/assets/fonts/merriweather-lightitalic-webfont.ttf b/assets/fonts/merriweather-lightitalic-webfont.ttf new file mode 100644 index 0000000..aa60615 Binary files /dev/null and b/assets/fonts/merriweather-lightitalic-webfont.ttf differ diff --git a/assets/fonts/merriweather-lightitalic-webfont.woff b/assets/fonts/merriweather-lightitalic-webfont.woff new file mode 100644 index 0000000..5cb6ac3 Binary files /dev/null and b/assets/fonts/merriweather-lightitalic-webfont.woff differ diff --git a/assets/fonts/merriweather-regular-webfont.eot b/assets/fonts/merriweather-regular-webfont.eot deleted file mode 100644 index 2d82cd0..0000000 Binary files a/assets/fonts/merriweather-regular-webfont.eot and /dev/null differ diff --git a/assets/fonts/merriweather-regular-webfont.ttf b/assets/fonts/merriweather-regular-webfont.ttf deleted file mode 100644 index 5356a6b..0000000 Binary files a/assets/fonts/merriweather-regular-webfont.ttf and /dev/null differ diff --git a/assets/fonts/merriweather-regular-webfont.woff b/assets/fonts/merriweather-regular-webfont.woff deleted file mode 100644 index 8c7ce6a..0000000 Binary files a/assets/fonts/merriweather-regular-webfont.woff and /dev/null differ diff --git a/assets/fonts/merriweather_light-webfont.eot b/assets/fonts/merriweather_light-webfont.eot new file mode 100644 index 0000000..1796417 Binary files /dev/null and b/assets/fonts/merriweather_light-webfont.eot differ diff --git a/assets/fonts/merriweather_light-webfont.ttf b/assets/fonts/merriweather_light-webfont.ttf new file mode 100644 index 0000000..7600dd6 Binary files /dev/null and b/assets/fonts/merriweather_light-webfont.ttf differ diff --git a/assets/fonts/merriweather_light-webfont.woff b/assets/fonts/merriweather_light-webfont.woff new file mode 100644 index 0000000..ebd04ce Binary files /dev/null and b/assets/fonts/merriweather_light-webfont.woff differ -- cgit v1.2.3