From c7aeca993ee472eed919db00f237cf9f9351207c Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 9 Jan 2016 16:05:53 -0500 Subject: Use WOFF versions of SourceSansPro See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023 --- app/assets/fonts/OFL.txt | 7 ++++--- app/assets/fonts/SourceSansPro-Black.ttf | Bin 289364 -> 0 bytes app/assets/fonts/SourceSansPro-Black.ttf.woff | Bin 0 -> 113800 bytes app/assets/fonts/SourceSansPro-BlackIt.ttf | Bin 103404 -> 0 bytes app/assets/fonts/SourceSansPro-BlackIt.ttf.woff | Bin 0 -> 49704 bytes app/assets/fonts/SourceSansPro-BlackItalic.ttf | Bin 116360 -> 0 bytes app/assets/fonts/SourceSansPro-Bold.ttf | Bin 291424 -> 0 bytes app/assets/fonts/SourceSansPro-Bold.ttf.woff | Bin 0 -> 117872 bytes app/assets/fonts/SourceSansPro-BoldIt.ttf | Bin 103608 -> 0 bytes app/assets/fonts/SourceSansPro-BoldIt.ttf.woff | Bin 0 -> 50608 bytes app/assets/fonts/SourceSansPro-BoldItalic.ttf | Bin 116192 -> 0 bytes app/assets/fonts/SourceSansPro-ExtraLight.ttf | Bin 291652 -> 0 bytes app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff | Bin 0 -> 114336 bytes app/assets/fonts/SourceSansPro-ExtraLightIt.ttf | Bin 104768 -> 0 bytes app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff | Bin 0 -> 49684 bytes app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf | Bin 117140 -> 0 bytes app/assets/fonts/SourceSansPro-It.ttf | Bin 104236 -> 0 bytes app/assets/fonts/SourceSansPro-It.ttf.woff | Bin 0 -> 51012 bytes app/assets/fonts/SourceSansPro-Italic.ttf | Bin 117328 -> 0 bytes app/assets/fonts/SourceSansPro-Light.ttf | Bin 293220 -> 0 bytes app/assets/fonts/SourceSansPro-Light.ttf.woff | Bin 0 -> 118284 bytes app/assets/fonts/SourceSansPro-LightIt.ttf | Bin 104616 -> 0 bytes app/assets/fonts/SourceSansPro-LightIt.ttf.woff | Bin 0 -> 50992 bytes app/assets/fonts/SourceSansPro-LightItalic.ttf | Bin 116960 -> 0 bytes app/assets/fonts/SourceSansPro-Regular.ttf | Bin 293956 -> 0 bytes app/assets/fonts/SourceSansPro-Regular.ttf.woff | Bin 0 -> 119064 bytes app/assets/fonts/SourceSansPro-Semibold.ttf | Bin 292404 -> 0 bytes app/assets/fonts/SourceSansPro-Semibold.ttf.woff | Bin 0 -> 118412 bytes app/assets/fonts/SourceSansPro-SemiboldIt.ttf | Bin 104020 -> 0 bytes app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff | Bin 0 -> 50924 bytes app/assets/fonts/SourceSansPro-SemiboldItalic.ttf | Bin 116424 -> 0 bytes app/assets/stylesheets/framework/fonts.scss | 8 ++++---- 32 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 app/assets/fonts/SourceSansPro-Black.ttf create mode 100755 app/assets/fonts/SourceSansPro-Black.ttf.woff delete mode 100644 app/assets/fonts/SourceSansPro-BlackIt.ttf create mode 100755 app/assets/fonts/SourceSansPro-BlackIt.ttf.woff delete mode 100755 app/assets/fonts/SourceSansPro-BlackItalic.ttf delete mode 100644 app/assets/fonts/SourceSansPro-Bold.ttf create mode 100755 app/assets/fonts/SourceSansPro-Bold.ttf.woff delete mode 100644 app/assets/fonts/SourceSansPro-BoldIt.ttf create mode 100755 app/assets/fonts/SourceSansPro-BoldIt.ttf.woff delete mode 100755 app/assets/fonts/SourceSansPro-BoldItalic.ttf delete mode 100644 app/assets/fonts/SourceSansPro-ExtraLight.ttf create mode 100755 app/assets/fonts/SourceSansPro-ExtraLight.ttf.woff delete mode 100644 app/assets/fonts/SourceSansPro-ExtraLightIt.ttf create mode 100755 app/assets/fonts/SourceSansPro-ExtraLightIt.ttf.woff delete mode 100755 app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf delete mode 100644 app/assets/fonts/SourceSansPro-It.ttf create mode 100755 app/assets/fonts/SourceSansPro-It.ttf.woff delete mode 100755 app/assets/fonts/SourceSansPro-Italic.ttf delete mode 100644 app/assets/fonts/SourceSansPro-Light.ttf create mode 100755 app/assets/fonts/SourceSansPro-Light.ttf.woff delete mode 100644 app/assets/fonts/SourceSansPro-LightIt.ttf create mode 100755 app/assets/fonts/SourceSansPro-LightIt.ttf.woff delete mode 100755 app/assets/fonts/SourceSansPro-LightItalic.ttf delete mode 100644 app/assets/fonts/SourceSansPro-Regular.ttf create mode 100755 app/assets/fonts/SourceSansPro-Regular.ttf.woff delete mode 100644 app/assets/fonts/SourceSansPro-Semibold.ttf create mode 100755 app/assets/fonts/SourceSansPro-Semibold.ttf.woff delete mode 100644 app/assets/fonts/SourceSansPro-SemiboldIt.ttf create mode 100755 app/assets/fonts/SourceSansPro-SemiboldIt.ttf.woff delete mode 100755 app/assets/fonts/SourceSansPro-SemiboldItalic.ttf diff --git a/app/assets/fonts/OFL.txt b/app/assets/fonts/OFL.txt index a9b845ed1d4..df187637e18 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 9c9b5cb7f03..00000000000 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 00000000000..b7e86200927 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 294ce5abe8f..00000000000 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 00000000000..c3314b1ef06 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 c719243c0d6..00000000000 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 5d65c93242f..00000000000 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 00000000000..d1d40f840f8 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 3decd130070..00000000000 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 00000000000..ef6ff514d3a 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 d20dd0c5eca..00000000000 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 253eafa3783..00000000000 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 00000000000..1e6c94d9eb3 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 00d7e9a7aa8..00000000000 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 00000000000..7a408b1ec73 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 2c34f3b8dc4..00000000000 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 f7af5377595..00000000000 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 00000000000..4d54bc95718 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 e5a1a86e631..00000000000 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 83a0a336661..00000000000 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 00000000000..1706d57d3c5 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 f18827985ef..00000000000 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 00000000000..87378d6c609 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 88a6778d24f..00000000000 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 44486cdc670..00000000000 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 00000000000..460ab12a638 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 86b00c067e0..00000000000 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 00000000000..43379631b2d 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 13d66a1fc45..00000000000 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 00000000000..232c2048ae7 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 2c5ad3008c3..00000000000 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 e214567eca1..20988f7b430 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'); } -- cgit v1.2.1