diff --git a/LICENSE.md b/LICENSE.md index 5bd9c7593b..caa15254cf 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,9 +2,9 @@ ### Files licensed under the SIL Open Font License -The Source Sans Pro font files in `src/fonts/source-sans-pro` are a customized subset of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. +The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. -The Merriweather font files in `src/fonts/merriweather` are from [Google Web Fonts](https://www.google.com/fonts#UsePlace:use/Collection:Merriweather:400,300,400italic,700,700italic), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'. +The Merriweather font files in `src/fonts/merriweather` are v2.001 from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'. The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL). diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.eot b/src/fonts/merriweather/Latin-Merriweather-Black.eot new file mode 100644 index 0000000000..1dfded6280 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Black.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.ttf b/src/fonts/merriweather/Latin-Merriweather-Black.ttf new file mode 100644 index 0000000000..b9c28db928 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Black.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.woff b/src/fonts/merriweather/Latin-Merriweather-Black.woff new file mode 100644 index 0000000000..9029a90353 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Black.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.woff2 b/src/fonts/merriweather/Latin-Merriweather-Black.woff2 new file mode 100644 index 0000000000..216e131b98 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Black.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.eot b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.eot new file mode 100644 index 0000000000..dda523c274 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.ttf b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.ttf new file mode 100644 index 0000000000..f89f61e4e0 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff new file mode 100644 index 0000000000..de1f538227 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff2 b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff2 new file mode 100644 index 0000000000..1bdcba39f2 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.eot b/src/fonts/merriweather/Latin-Merriweather-Bold.eot new file mode 100644 index 0000000000..78e0eabdd1 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Bold.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.ttf b/src/fonts/merriweather/Latin-Merriweather-Bold.ttf new file mode 100644 index 0000000000..13ff2c34bf Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Bold.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.woff b/src/fonts/merriweather/Latin-Merriweather-Bold.woff new file mode 100644 index 0000000000..23f696c862 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Bold.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.woff2 b/src/fonts/merriweather/Latin-Merriweather-Bold.woff2 new file mode 100644 index 0000000000..b71dc5a05a Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Bold.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.eot b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.eot new file mode 100644 index 0000000000..45e3467042 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.ttf b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.ttf new file mode 100644 index 0000000000..e22a8749db Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff new file mode 100644 index 0000000000..258eed4779 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff2 b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff2 new file mode 100644 index 0000000000..36d3abfc75 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.eot b/src/fonts/merriweather/Latin-Merriweather-Italic.eot new file mode 100644 index 0000000000..037b2e4921 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Italic.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.ttf b/src/fonts/merriweather/Latin-Merriweather-Italic.ttf new file mode 100644 index 0000000000..a407f0aaf7 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Italic.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.woff b/src/fonts/merriweather/Latin-Merriweather-Italic.woff new file mode 100644 index 0000000000..f75c674f8a Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Italic.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.woff2 b/src/fonts/merriweather/Latin-Merriweather-Italic.woff2 new file mode 100644 index 0000000000..09916326ac Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Italic.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.eot b/src/fonts/merriweather/Latin-Merriweather-Light.eot new file mode 100644 index 0000000000..a879eb3257 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Light.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.ttf b/src/fonts/merriweather/Latin-Merriweather-Light.ttf new file mode 100644 index 0000000000..27917b6eb8 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Light.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.woff b/src/fonts/merriweather/Latin-Merriweather-Light.woff new file mode 100644 index 0000000000..c8d43f2e73 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Light.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.woff2 b/src/fonts/merriweather/Latin-Merriweather-Light.woff2 new file mode 100644 index 0000000000..a0eadc335a Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Light.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.eot b/src/fonts/merriweather/Latin-Merriweather-LightItalic.eot new file mode 100644 index 0000000000..add98a3b28 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-LightItalic.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.ttf b/src/fonts/merriweather/Latin-Merriweather-LightItalic.ttf new file mode 100644 index 0000000000..eb93446e2e Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-LightItalic.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff b/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff new file mode 100644 index 0000000000..e8f755ab14 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff2 b/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff2 new file mode 100644 index 0000000000..5112dab4c6 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff2 differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.eot b/src/fonts/merriweather/Latin-Merriweather-Regular.eot new file mode 100644 index 0000000000..78a0ad67e0 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Regular.eot differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.ttf b/src/fonts/merriweather/Latin-Merriweather-Regular.ttf new file mode 100644 index 0000000000..d9462c8adb Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Regular.ttf differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.woff b/src/fonts/merriweather/Latin-Merriweather-Regular.woff new file mode 100644 index 0000000000..61e89832ae Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Regular.woff differ diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.woff2 b/src/fonts/merriweather/Latin-Merriweather-Regular.woff2 new file mode 100644 index 0000000000..9a9bd64435 Binary files /dev/null and b/src/fonts/merriweather/Latin-Merriweather-Regular.woff2 differ diff --git a/src/fonts/merriweather/merriweather-bold-webfont.eot b/src/fonts/merriweather/merriweather-bold-webfont.eot deleted file mode 100755 index c77b53bdd0..0000000000 Binary files a/src/fonts/merriweather/merriweather-bold-webfont.eot and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-bold-webfont.ttf b/src/fonts/merriweather/merriweather-bold-webfont.ttf deleted file mode 100755 index 44f33c239f..0000000000 Binary files a/src/fonts/merriweather/merriweather-bold-webfont.ttf and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-bold-webfont.woff b/src/fonts/merriweather/merriweather-bold-webfont.woff deleted file mode 100755 index a728400d5f..0000000000 Binary files a/src/fonts/merriweather/merriweather-bold-webfont.woff and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-bold-webfont.woff2 b/src/fonts/merriweather/merriweather-bold-webfont.woff2 deleted file mode 100755 index ff3bddfbd9..0000000000 Binary files a/src/fonts/merriweather/merriweather-bold-webfont.woff2 and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-italic-webfont.eot b/src/fonts/merriweather/merriweather-italic-webfont.eot deleted file mode 100755 index 8841854416..0000000000 Binary files a/src/fonts/merriweather/merriweather-italic-webfont.eot and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-italic-webfont.ttf b/src/fonts/merriweather/merriweather-italic-webfont.ttf deleted file mode 100755 index 3180e526d9..0000000000 Binary files a/src/fonts/merriweather/merriweather-italic-webfont.ttf and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-italic-webfont.woff b/src/fonts/merriweather/merriweather-italic-webfont.woff deleted file mode 100755 index d7071e3c23..0000000000 Binary files a/src/fonts/merriweather/merriweather-italic-webfont.woff and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-italic-webfont.woff2 b/src/fonts/merriweather/merriweather-italic-webfont.woff2 deleted file mode 100755 index f8660d06ff..0000000000 Binary files a/src/fonts/merriweather/merriweather-italic-webfont.woff2 and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-light-webfont.eot b/src/fonts/merriweather/merriweather-light-webfont.eot deleted file mode 100755 index 4115d282bb..0000000000 Binary files a/src/fonts/merriweather/merriweather-light-webfont.eot and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-light-webfont.ttf b/src/fonts/merriweather/merriweather-light-webfont.ttf deleted file mode 100755 index 03cfa42533..0000000000 Binary files a/src/fonts/merriweather/merriweather-light-webfont.ttf and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-light-webfont.woff b/src/fonts/merriweather/merriweather-light-webfont.woff deleted file mode 100755 index 9b3427536d..0000000000 Binary files a/src/fonts/merriweather/merriweather-light-webfont.woff and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-light-webfont.woff2 b/src/fonts/merriweather/merriweather-light-webfont.woff2 deleted file mode 100755 index e53e4b531e..0000000000 Binary files a/src/fonts/merriweather/merriweather-light-webfont.woff2 and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-regular-webfont.eot b/src/fonts/merriweather/merriweather-regular-webfont.eot deleted file mode 100755 index c4cde6d015..0000000000 Binary files a/src/fonts/merriweather/merriweather-regular-webfont.eot and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-regular-webfont.ttf b/src/fonts/merriweather/merriweather-regular-webfont.ttf deleted file mode 100755 index 3889a60658..0000000000 Binary files a/src/fonts/merriweather/merriweather-regular-webfont.ttf and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-regular-webfont.woff b/src/fonts/merriweather/merriweather-regular-webfont.woff deleted file mode 100755 index 1969d2ed0d..0000000000 Binary files a/src/fonts/merriweather/merriweather-regular-webfont.woff and /dev/null differ diff --git a/src/fonts/merriweather/merriweather-regular-webfont.woff2 b/src/fonts/merriweather/merriweather-regular-webfont.woff2 deleted file mode 100755 index 3023ce73c8..0000000000 Binary files a/src/fonts/merriweather/merriweather-regular-webfont.woff2 and /dev/null differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.eot new file mode 100644 index 0000000000..827ea014a0 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.ttf new file mode 100644 index 0000000000..1b79045467 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff new file mode 100644 index 0000000000..5b50e638d8 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff2 new file mode 100644 index 0000000000..97bfa7ac5a Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.eot new file mode 100644 index 0000000000..3b7a9055b5 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.ttf new file mode 100644 index 0000000000..8fbf06d530 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff new file mode 100644 index 0000000000..8982c49d1c Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff2 new file mode 100644 index 0000000000..8078928bc4 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.eot index f031b206e4..39667fd6bf 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.eot and b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.ttf index 02ae55e6e7..a1147fec93 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.ttf and b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff index 1985bc0f19..67f86c2d7a 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff and b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2 index 59cbda5199..24e4f50516 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2 and b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.eot new file mode 100644 index 0000000000..f836dbe24c Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.ttf new file mode 100644 index 0000000000..14a9541ce1 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff new file mode 100644 index 0000000000..f18e6673f3 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff2 new file mode 100644 index 0000000000..f2c30fa236 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.eot new file mode 100644 index 0000000000..f9a1677cd4 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.ttf new file mode 100644 index 0000000000..6b9bd79f62 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff new file mode 100644 index 0000000000..fa66d49fc5 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff2 new file mode 100644 index 0000000000..a18eefb57f Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.eot new file mode 100644 index 0000000000..be34754810 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.ttf new file mode 100644 index 0000000000..1596882661 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff new file mode 100644 index 0000000000..815f93c402 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff2 new file mode 100644 index 0000000000..15f0dd6f04 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.eot index e01ae4de04..933e4d4ddc 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.eot and b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.ttf index b513caef9b..65e63d3858 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.ttf and b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff index a512221dda..3410cbc6fe 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff and b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2 index c1a6d9f1e8..9f3d584a65 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2 and b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.eot index 55d1c876c9..ab8daa99af 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.eot and b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.ttf index a4c674a00f..df4ce28a1a 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.ttf and b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff index eb2fd5ae65..c26af986e2 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff and b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff2 index 091b8079af..cab9b3695a 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff2 and b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.eot new file mode 100644 index 0000000000..6e2dad6e09 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.ttf new file mode 100644 index 0000000000..9468da5583 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff new file mode 100644 index 0000000000..1b7a5e894e Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff2 new file mode 100644 index 0000000000..6d7df0e336 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.eot index cddebbca5f..348208ab6c 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.eot and b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.ttf index ac42fa1c24..23b0fac186 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.ttf and b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff index e057c48e84..a5fff7d705 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff and b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2 index 43ec601dc2..802b8be0d3 100644 Binary files a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2 and b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.eot new file mode 100644 index 0000000000..3853108d57 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.ttf new file mode 100644 index 0000000000..2e2d73b4cb Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff new file mode 100644 index 0000000000..9cebbb61de Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff2 new file mode 100644 index 0000000000..33a754390d Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff2 differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.eot new file mode 100644 index 0000000000..018bc54f4b Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.eot differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.ttf new file mode 100644 index 0000000000..585e6b04ec Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.ttf differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff new file mode 100644 index 0000000000..aa7d0a1e07 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff differ diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff2 new file mode 100644 index 0000000000..5bae4ec339 Binary files /dev/null and b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff2 differ diff --git a/src/stylesheets/core/_system-tokens.scss b/src/stylesheets/core/_system-tokens.scss index 1b455642cc..e72057fac2 100644 --- a/src/stylesheets/core/_system-tokens.scss +++ b/src/stylesheets/core/_system-tokens.scss @@ -208,31 +208,31 @@ $system-typeface-tokens: ( ), 'merriweather': ( display-name: 'Merriweather Web', - cap-height: 385px, + cap-height: 371px, stack: $font-stack-georgia, src: ( dir: 'merriweather', roman: ( 100: false, 200: false, - 300: 'merriweather-light-webfont', - 400: 'merriweather-regular-webfont', + 300: 'Latin-Merriweather-Light', + 400: 'Latin-Merriweather-Regular', 500: false, 600: false, - 700: 'merriweather-bold-webfont', + 700: 'Latin-Merriweather-Bold', 800: false, - 900: false, + 900: 'Latin-Merriweather-Black', ), italic: ( 100: false, 200: false, - 300: false, - 400: 'merriweather-italic-webfont', + 300: 'Latin-Merriweather-LightItalic', + 400: 'Latin-Merriweather-Italic', 500: false, 600: false, - 700: false, + 700: 'Latin-Merriweather-BoldItalic', 800: false, - 900: false, + 900: 'Latin-Merriweather-BlackItalic', ), ), ), @@ -274,25 +274,25 @@ $system-typeface-tokens: ( dir: 'source-sans-pro', roman: ( 100: false, - 200: false, + 200: 'sourcesanspro-extralight-webfont', 300: 'sourcesanspro-light-webfont', 400: 'sourcesanspro-regular-webfont', 500: false, - 600: false, + 600: 'sourcesanspro-semibold-webfont', 700: 'sourcesanspro-bold-webfont', 800: false, - 900: false, + 900: 'sourcesanspro-black-webfont', ), italic: ( 100: false, - 200: false, - 300: false, - 400: 'sourcesanspro-italic-webfont', + 200: 'sourcesanspro-extralightitalic-webfont', + 300: 'sourcesanspro-lightitalic-webfont', + 400: 'sourcesanspro-regularitalic-webfont', 500: false, - 600: false, - 700: false, + 600: 'sourcesanspro-semibolditalic-webfont', + 700: 'sourcesanspro-bolditalic-webfont', 800: false, - 900: false, + 900: 'sourcesanspro-blackitalic-webfont', ), ), ),