diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300.eot b/source/fonts/merriweather-v19-latin-ext_latin-300.eot new file mode 100644 index 0000000..16c1aaa Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300.eot differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300.svg b/source/fonts/merriweather-v19-latin-ext_latin-300.svg new file mode 100644 index 0000000..78c4780 --- /dev/null +++ b/source/fonts/merriweather-v19-latin-ext_latin-300.svg @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300.ttf b/source/fonts/merriweather-v19-latin-ext_latin-300.ttf new file mode 100644 index 0000000..67498d2 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300.ttf differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300.woff b/source/fonts/merriweather-v19-latin-ext_latin-300.woff new file mode 100644 index 0000000..b6591b2 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300.woff differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300.woff2 b/source/fonts/merriweather-v19-latin-ext_latin-300.woff2 new file mode 100644 index 0000000..da41a6c Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300.woff2 differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300italic.eot b/source/fonts/merriweather-v19-latin-ext_latin-300italic.eot new file mode 100644 index 0000000..f7cf829 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300italic.eot differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300italic.svg b/source/fonts/merriweather-v19-latin-ext_latin-300italic.svg new file mode 100644 index 0000000..0848ae0 --- /dev/null +++ b/source/fonts/merriweather-v19-latin-ext_latin-300italic.svg @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300italic.ttf b/source/fonts/merriweather-v19-latin-ext_latin-300italic.ttf new file mode 100644 index 0000000..6cf4c86 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300italic.ttf differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300italic.woff b/source/fonts/merriweather-v19-latin-ext_latin-300italic.woff new file mode 100644 index 0000000..1208967 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300italic.woff differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-300italic.woff2 b/source/fonts/merriweather-v19-latin-ext_latin-300italic.woff2 new file mode 100644 index 0000000..77992ea Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-300italic.woff2 differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700.eot b/source/fonts/merriweather-v19-latin-ext_latin-700.eot new file mode 100644 index 0000000..427c47e Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700.eot differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700.svg b/source/fonts/merriweather-v19-latin-ext_latin-700.svg new file mode 100644 index 0000000..c0e3e88 --- /dev/null +++ b/source/fonts/merriweather-v19-latin-ext_latin-700.svg @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700.ttf b/source/fonts/merriweather-v19-latin-ext_latin-700.ttf new file mode 100644 index 0000000..defe490 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700.ttf differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700.woff b/source/fonts/merriweather-v19-latin-ext_latin-700.woff new file mode 100644 index 0000000..7429a1d Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700.woff differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700.woff2 b/source/fonts/merriweather-v19-latin-ext_latin-700.woff2 new file mode 100644 index 0000000..ec67743 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700.woff2 differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700italic.eot b/source/fonts/merriweather-v19-latin-ext_latin-700italic.eot new file mode 100644 index 0000000..66a6f2b Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700italic.eot differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700italic.svg b/source/fonts/merriweather-v19-latin-ext_latin-700italic.svg new file mode 100644 index 0000000..f4dcc41 --- /dev/null +++ b/source/fonts/merriweather-v19-latin-ext_latin-700italic.svg @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700italic.ttf b/source/fonts/merriweather-v19-latin-ext_latin-700italic.ttf new file mode 100644 index 0000000..a497850 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700italic.ttf differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700italic.woff b/source/fonts/merriweather-v19-latin-ext_latin-700italic.woff new file mode 100644 index 0000000..85d9820 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700italic.woff differ diff --git a/source/fonts/merriweather-v19-latin-ext_latin-700italic.woff2 b/source/fonts/merriweather-v19-latin-ext_latin-700italic.woff2 new file mode 100644 index 0000000..cdaca87 Binary files /dev/null and b/source/fonts/merriweather-v19-latin-ext_latin-700italic.woff2 differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-700.eot b/source/fonts/open-sans-v15-latin_latin-ext-700.eot new file mode 100644 index 0000000..689c3c5 Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-700.eot differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-700.svg b/source/fonts/open-sans-v15-latin_latin-ext-700.svg new file mode 100644 index 0000000..8e6b61a --- /dev/null +++ b/source/fonts/open-sans-v15-latin_latin-ext-700.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/fonts/open-sans-v15-latin_latin-ext-700.ttf b/source/fonts/open-sans-v15-latin_latin-ext-700.ttf new file mode 100644 index 0000000..81fbfc4 Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-700.ttf differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-700.woff b/source/fonts/open-sans-v15-latin_latin-ext-700.woff new file mode 100644 index 0000000..30b4c3f Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-700.woff differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-700.woff2 b/source/fonts/open-sans-v15-latin_latin-ext-700.woff2 new file mode 100644 index 0000000..749a971 Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-700.woff2 differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-regular.eot b/source/fonts/open-sans-v15-latin_latin-ext-regular.eot new file mode 100644 index 0000000..f25146f Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-regular.eot differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-regular.svg b/source/fonts/open-sans-v15-latin_latin-ext-regular.svg new file mode 100644 index 0000000..78eb653 --- /dev/null +++ b/source/fonts/open-sans-v15-latin_latin-ext-regular.svg @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/fonts/open-sans-v15-latin_latin-ext-regular.ttf b/source/fonts/open-sans-v15-latin_latin-ext-regular.ttf new file mode 100644 index 0000000..65a04f1 Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-regular.ttf differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-regular.woff b/source/fonts/open-sans-v15-latin_latin-ext-regular.woff new file mode 100644 index 0000000..6ca02c4 Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-regular.woff differ diff --git a/source/fonts/open-sans-v15-latin_latin-ext-regular.woff2 b/source/fonts/open-sans-v15-latin_latin-ext-regular.woff2 new file mode 100644 index 0000000..a337154 Binary files /dev/null and b/source/fonts/open-sans-v15-latin_latin-ext-regular.woff2 differ diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml index 2596b94..59432f9 100644 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.haml @@ -35,7 +35,6 @@ = feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" = favicon_tag 'images/favicon.ico' - %link{rel: :stylesheet, type: 'text/css', href: '//fonts.googleapis.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400'} = stylesheet_link_tag :application %link{rel: 'author', type: 'text/plain', href: '/humans.txt'} - if current_page.data.canonical diff --git a/source/stylesheets/_icons.css.scss b/source/stylesheets/_icons.css.scss index 55aa549..684a1c9 100644 --- a/source/stylesheets/_icons.css.scss +++ b/source/stylesheets/_icons.css.scss @@ -8,6 +8,7 @@ url('../fonts/icons.svg?43660247#icons') format('svg'); font-weight: normal; font-style: normal; + font-display: block; } [class^="icon-"]:before, [class*=" icon-"]:before { diff --git a/source/stylesheets/_merriweather.css.scss b/source/stylesheets/_merriweather.css.scss new file mode 100644 index 0000000..92d8729 --- /dev/null +++ b/source/stylesheets/_merriweather.css.scss @@ -0,0 +1,56 @@ +/* merriweather-300 - latin-ext_latin */ +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 300; + font-display: optional; + src: url('../fonts/merriweather-v19-latin-ext_latin-300.eot'); /* IE9 Compat Modes */ + src: local('Merriweather Light'), local('Merriweather-Light'), + url('../fonts/merriweather-v19-latin-ext_latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/merriweather-v19-latin-ext_latin-300.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-300.woff') format('woff'), /* Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/merriweather-v19-latin-ext_latin-300.svg#Merriweather') format('svg'); /* Legacy iOS */ +} +/* merriweather-300italic - latin-ext_latin */ +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 300; + font-display: optional; + src: url('../fonts/merriweather-v19-latin-ext_latin-300italic.eot'); /* IE9 Compat Modes */ + src: local('Merriweather Light Italic'), local('Merriweather-LightItalic'), + url('../fonts/merriweather-v19-latin-ext_latin-300italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/merriweather-v19-latin-ext_latin-300italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-300italic.woff') format('woff'), /* Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-300italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/merriweather-v19-latin-ext_latin-300italic.svg#Merriweather') format('svg'); /* Legacy iOS */ +} +/* merriweather-700 - latin-ext_latin */ +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 700; + font-display: optional; + src: url('../fonts/merriweather-v19-latin-ext_latin-700.eot'); /* IE9 Compat Modes */ + src: local('Merriweather Bold'), local('Merriweather-Bold'), + url('../fonts/merriweather-v19-latin-ext_latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/merriweather-v19-latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-700.woff') format('woff'), /* Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/merriweather-v19-latin-ext_latin-700.svg#Merriweather') format('svg'); /* Legacy iOS */ +} +/* merriweather-700italic - latin-ext_latin */ +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 700; + font-display: optional; + src: url('../fonts/merriweather-v19-latin-ext_latin-700italic.eot'); /* IE9 Compat Modes */ + src: local('Merriweather Bold Italic'), local('Merriweather-BoldItalic'), + url('../fonts/merriweather-v19-latin-ext_latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/merriweather-v19-latin-ext_latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-700italic.woff') format('woff'), /* Modern Browsers */ + url('../fonts/merriweather-v19-latin-ext_latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/merriweather-v19-latin-ext_latin-700italic.svg#Merriweather') format('svg'); /* Legacy iOS */ +} diff --git a/source/stylesheets/_open_sans.css.scss b/source/stylesheets/_open_sans.css.scss new file mode 100644 index 0000000..f4bf2e0 --- /dev/null +++ b/source/stylesheets/_open_sans.css.scss @@ -0,0 +1,28 @@ +/* open-sans-regular - latin_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + font-display: optional; + src: url('../fonts/open-sans-v15-latin_latin-ext-regular.eot'); /* IE9 Compat Modes */ + src: local('Open Sans Regular'), local('OpenSans-Regular'), + url('../fonts/open-sans-v15-latin_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/open-sans-v15-latin_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/open-sans-v15-latin_latin-ext-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/open-sans-v15-latin_latin-ext-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/open-sans-v15-latin_latin-ext-regular.svg#OpenSans') format('svg'); /* Legacy iOS */ +} +/* open-sans-700 - latin_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + font-display: optional; + src: url('../fonts/open-sans-v15-latin_latin-ext-700.eot'); /* IE9 Compat Modes */ + src: local('Open Sans Bold'), local('OpenSans-Bold'), + url('../fonts/open-sans-v15-latin_latin-ext-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/open-sans-v15-latin_latin-ext-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/open-sans-v15-latin_latin-ext-700.woff') format('woff'), /* Modern Browsers */ + url('../fonts/open-sans-v15-latin_latin-ext-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/open-sans-v15-latin_latin-ext-700.svg#OpenSans') format('svg'); /* Legacy iOS */ +} diff --git a/source/stylesheets/application.css.scss b/source/stylesheets/application.css.scss index e143de9..b1a9d58 100644 --- a/source/stylesheets/application.css.scss +++ b/source/stylesheets/application.css.scss @@ -2,6 +2,8 @@ @import 'casper_override'; @import 'syntax'; @import 'icons'; +@import 'merriweather'; +@import 'open_sans'; .home-button { @extend .menu-button;