summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_includes/fonts.scss20
-rw-r--r--_sass/_base.scss1
-rw-r--r--_sass/_variables.scss2
-rw-r--r--assets/fonts/merriweather-italic-webfont.eotbin28718 -> 0 bytes
-rw-r--r--assets/fonts/merriweather-italic-webfont.ttfbin59888 -> 0 bytes
-rw-r--r--assets/fonts/merriweather-italic-webfont.woffbin32868 -> 0 bytes
-rw-r--r--assets/fonts/merriweather-lightitalic-webfont.eotbin0 -> 29170 bytes
-rw-r--r--assets/fonts/merriweather-lightitalic-webfont.ttfbin0 -> 60484 bytes
-rw-r--r--assets/fonts/merriweather-lightitalic-webfont.woffbin0 -> 33320 bytes
-rw-r--r--assets/fonts/merriweather-regular-webfont.eotbin28208 -> 0 bytes
-rw-r--r--assets/fonts/merriweather-regular-webfont.ttfbin57656 -> 0 bytes
-rw-r--r--assets/fonts/merriweather-regular-webfont.woffbin31840 -> 0 bytes
-rw-r--r--assets/fonts/merriweather_light-webfont.eotbin0 -> 28224 bytes
-rw-r--r--assets/fonts/merriweather_light-webfont.ttfbin0 -> 57452 bytes
-rw-r--r--assets/fonts/merriweather_light-webfont.woffbin0 -> 31620 bytes
15 files changed, 11 insertions, 12 deletions
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
--- a/assets/fonts/merriweather-italic-webfont.eot
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/merriweather-italic-webfont.ttf b/assets/fonts/merriweather-italic-webfont.ttf
deleted file mode 100644
index 6584562..0000000
--- a/assets/fonts/merriweather-italic-webfont.ttf
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/merriweather-italic-webfont.woff b/assets/fonts/merriweather-italic-webfont.woff
deleted file mode 100644
index f01ac25..0000000
--- a/assets/fonts/merriweather-italic-webfont.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/merriweather-lightitalic-webfont.eot b/assets/fonts/merriweather-lightitalic-webfont.eot
new file mode 100644
index 0000000..a677e49
--- /dev/null
+++ b/assets/fonts/merriweather-lightitalic-webfont.eot
Binary files differ
diff --git a/assets/fonts/merriweather-lightitalic-webfont.ttf b/assets/fonts/merriweather-lightitalic-webfont.ttf
new file mode 100644
index 0000000..aa60615
--- /dev/null
+++ b/assets/fonts/merriweather-lightitalic-webfont.ttf
Binary files differ
diff --git a/assets/fonts/merriweather-lightitalic-webfont.woff b/assets/fonts/merriweather-lightitalic-webfont.woff
new file mode 100644
index 0000000..5cb6ac3
--- /dev/null
+++ b/assets/fonts/merriweather-lightitalic-webfont.woff
Binary files differ
diff --git a/assets/fonts/merriweather-regular-webfont.eot b/assets/fonts/merriweather-regular-webfont.eot
deleted file mode 100644
index 2d82cd0..0000000
--- a/assets/fonts/merriweather-regular-webfont.eot
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/merriweather-regular-webfont.ttf b/assets/fonts/merriweather-regular-webfont.ttf
deleted file mode 100644
index 5356a6b..0000000
--- a/assets/fonts/merriweather-regular-webfont.ttf
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/merriweather-regular-webfont.woff b/assets/fonts/merriweather-regular-webfont.woff
deleted file mode 100644
index 8c7ce6a..0000000
--- a/assets/fonts/merriweather-regular-webfont.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/merriweather_light-webfont.eot b/assets/fonts/merriweather_light-webfont.eot
new file mode 100644
index 0000000..1796417
--- /dev/null
+++ b/assets/fonts/merriweather_light-webfont.eot
Binary files differ
diff --git a/assets/fonts/merriweather_light-webfont.ttf b/assets/fonts/merriweather_light-webfont.ttf
new file mode 100644
index 0000000..7600dd6
--- /dev/null
+++ b/assets/fonts/merriweather_light-webfont.ttf
Binary files differ
diff --git a/assets/fonts/merriweather_light-webfont.woff b/assets/fonts/merriweather_light-webfont.woff
new file mode 100644
index 0000000..ebd04ce
--- /dev/null
+++ b/assets/fonts/merriweather_light-webfont.woff
Binary files differ