diff --git a/app/assets/fonts/OFL.txt b/app/assets/fonts/OFL.txt index a9b845ed1d..df187637e1 100755 --- a/app/assets/fonts/OFL.txt +++ b/app/assets/fonts/OFL.txt @@ -1,7 +1,8 @@ -Copyright 2010, 2012 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. +Copyright 2010, 2012, 2014 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. + This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL ----------------------------------------------------------- diff --git a/app/assets/fonts/SourceSansPro-Black.ttf b/app/assets/fonts/SourceSansPro-Black.ttf deleted file mode 100644 index 9c9b5cb7f0..0000000000 Binary files a/app/assets/fonts/SourceSansPro-Black.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Black.ttf.woff b/app/assets/fonts/SourceSansPro-Black.ttf.woff new file mode 100755 index 0000000000..b7e8620092 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-Black.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-BlackIt.ttf b/app/assets/fonts/SourceSansPro-BlackIt.ttf deleted file mode 100644 index 294ce5abe8..0000000000 Binary files a/app/assets/fonts/SourceSansPro-BlackIt.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-BlackIt.ttf.woff b/app/assets/fonts/SourceSansPro-BlackIt.ttf.woff new file mode 100755 index 0000000000..c3314b1ef0 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-BlackIt.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-BlackItalic.ttf b/app/assets/fonts/SourceSansPro-BlackItalic.ttf deleted file mode 100755 index c719243c0d..0000000000 Binary files a/app/assets/fonts/SourceSansPro-BlackItalic.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Bold.ttf b/app/assets/fonts/SourceSansPro-Bold.ttf deleted file mode 100644 index 5d65c93242..0000000000 Binary files a/app/assets/fonts/SourceSansPro-Bold.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Bold.ttf.woff b/app/assets/fonts/SourceSansPro-Bold.ttf.woff new file mode 100755 index 0000000000..d1d40f840f Binary files /dev/null and b/app/assets/fonts/SourceSansPro-Bold.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-BoldIt.ttf b/app/assets/fonts/SourceSansPro-BoldIt.ttf deleted file mode 100644 index 3decd13007..0000000000 Binary files a/app/assets/fonts/SourceSansPro-BoldIt.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-BoldIt.ttf.woff b/app/assets/fonts/SourceSansPro-BoldIt.ttf.woff new file mode 100755 index 0000000000..ef6ff514d3 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-BoldIt.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-BoldItalic.ttf b/app/assets/fonts/SourceSansPro-BoldItalic.ttf deleted file mode 100755 index d20dd0c5ec..0000000000 Binary files a/app/assets/fonts/SourceSansPro-BoldItalic.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-ExtraLight.ttf b/app/assets/fonts/SourceSansPro-ExtraLight.ttf deleted file mode 100644 index 253eafa378..0000000000 Binary files a/app/assets/fonts/SourceSansPro-ExtraLight.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff b/app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff new file mode 100755 index 0000000000..1e6c94d9eb Binary files /dev/null and b/app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-ExtraLightIt.ttf b/app/assets/fonts/SourceSansPro-ExtraLightIt.ttf deleted file mode 100644 index 00d7e9a7aa..0000000000 Binary files a/app/assets/fonts/SourceSansPro-ExtraLightIt.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff b/app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff new file mode 100755 index 0000000000..7a408b1ec7 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf b/app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf deleted file mode 100755 index 2c34f3b8dc..0000000000 Binary files a/app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-It.ttf b/app/assets/fonts/SourceSansPro-It.ttf deleted file mode 100644 index f7af537759..0000000000 Binary files a/app/assets/fonts/SourceSansPro-It.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-It.ttf.woff b/app/assets/fonts/SourceSansPro-It.ttf.woff new file mode 100755 index 0000000000..4d54bc9571 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-It.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-Italic.ttf b/app/assets/fonts/SourceSansPro-Italic.ttf deleted file mode 100755 index e5a1a86e63..0000000000 Binary files a/app/assets/fonts/SourceSansPro-Italic.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Light.ttf b/app/assets/fonts/SourceSansPro-Light.ttf deleted file mode 100644 index 83a0a33666..0000000000 Binary files a/app/assets/fonts/SourceSansPro-Light.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Light.ttf.woff b/app/assets/fonts/SourceSansPro-Light.ttf.woff new file mode 100755 index 0000000000..1706d57d3c Binary files /dev/null and b/app/assets/fonts/SourceSansPro-Light.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-LightIt.ttf b/app/assets/fonts/SourceSansPro-LightIt.ttf deleted file mode 100644 index f18827985e..0000000000 Binary files a/app/assets/fonts/SourceSansPro-LightIt.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-LightIt.ttf.woff b/app/assets/fonts/SourceSansPro-LightIt.ttf.woff new file mode 100755 index 0000000000..87378d6c60 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-LightIt.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-LightItalic.ttf b/app/assets/fonts/SourceSansPro-LightItalic.ttf deleted file mode 100755 index 88a6778d24..0000000000 Binary files a/app/assets/fonts/SourceSansPro-LightItalic.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Regular.ttf b/app/assets/fonts/SourceSansPro-Regular.ttf deleted file mode 100644 index 44486cdc67..0000000000 Binary files a/app/assets/fonts/SourceSansPro-Regular.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Regular.ttf.woff b/app/assets/fonts/SourceSansPro-Regular.ttf.woff new file mode 100755 index 0000000000..460ab12a63 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-Regular.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-Semibold.ttf b/app/assets/fonts/SourceSansPro-Semibold.ttf deleted file mode 100644 index 86b00c067e..0000000000 Binary files a/app/assets/fonts/SourceSansPro-Semibold.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-Semibold.ttf.woff b/app/assets/fonts/SourceSansPro-Semibold.ttf.woff new file mode 100755 index 0000000000..43379631b2 Binary files /dev/null and b/app/assets/fonts/SourceSansPro-Semibold.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-SemiboldIt.ttf b/app/assets/fonts/SourceSansPro-SemiboldIt.ttf deleted file mode 100644 index 13d66a1fc4..0000000000 Binary files a/app/assets/fonts/SourceSansPro-SemiboldIt.ttf and /dev/null differ diff --git a/app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff b/app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff new file mode 100755 index 0000000000..232c2048ae Binary files /dev/null and b/app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff differ diff --git a/app/assets/fonts/SourceSansPro-SemiboldItalic.ttf b/app/assets/fonts/SourceSansPro-SemiboldItalic.ttf deleted file mode 100755 index 2c5ad3008c..0000000000 Binary files a/app/assets/fonts/SourceSansPro-SemiboldItalic.ttf and /dev/null differ diff --git a/app/assets/stylesheets/framework/fonts.scss b/app/assets/stylesheets/framework/fonts.scss index e214567eca..20988f7b43 100644 --- a/app/assets/stylesheets/framework/fonts.scss +++ b/app/assets/stylesheets/framework/fonts.scss @@ -3,23 +3,23 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), font-url('SourceSansPro-Light.ttf'); + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), font-url('SourceSansPro-Light.ttf.woff'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Sans Pro'), local('SourceSansPro-Regular'), font-url('SourceSansPro-Regular.ttf'); + src: local('Source Sans Pro'), local('SourceSansPro-Regular'), font-url('SourceSansPro-Regular.ttf.woff'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; - src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), font-url('SourceSansPro-Semibold.ttf'); + src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), font-url('SourceSansPro-Semibold.ttf.woff'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; - src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), font-url('SourceSansPro-Bold.ttf'); + src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), font-url('SourceSansPro-Bold.ttf.woff'); }