diff options
| author | Ben Burwell <ben@benburwell.com> | 2015-05-11 16:59:21 -0400 |
|---|---|---|
| committer | Ben Burwell <ben@benburwell.com> | 2015-05-11 16:59:21 -0400 |
| commit | ea2ce92242db58fdbf0319192deb2821eef74a06 (patch) | |
| tree | 8abffb4d4a9517431c6516cdab641b3294998690 /_includes | |
| parent | de8f745817684a3cccbdaa0c17286792f07cbd24 (diff) | |
| parent | 4ead5d2173d31e914ae7434872270d18c23f2cbf (diff) | |
Merge pull request #4 from benburwell/updates
Updates
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/fonts.scss | 31 |
1 files changed, 18 insertions, 13 deletions
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 |