Bundle Roboto Slab as a real web font (not just ttf) (#642)

readthedocs · May 24, 2018 · 9fdadd5 · 9fdadd5
1 parent 17ecdc6
commit 9fdadd5
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,15 @@
+# Document global line endings settings
+# https://help.github.com/articles/dealing-with-line-endings/
+*       text eol=lf
+
+
+# Denote all files that are truly binary and should not be modified.
+*.ai    binary
+*.jpg   binary
+*.otf   binary
+*.png   binary
+*.eot   binary
+*.ttf   binary
+*.whl   binary
+*.woff  binary
+*.woff2 binary
diff --git a/Apache-License-2.0.txt b/Apache-License-2.0.txt
@@ -1,5 +1,4 @@
-sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
-sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.tt/
+/fonts/RobotoSlab/*
 
 
                                  Apache License

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -45,9 +45,8 @@ module.exports = function(grunt) {
           {
               expand: true,
               flatten: true,
-              src: ['bower_components/robotoslab-googlefont/RobotoSlab-Bold.ttf',
-                    'bower_components/robotoslab-googlefont/RobotoSlab-Regular.ttf'],
-              dest: 'sphinx_rtd_theme/static/fonts/',
+              src: ['fonts/RobotoSlab/*'],
+              dest: 'sphinx_rtd_theme/static/fonts/RobotoSlab/',
               filter: 'isFile'
           }
         ]

diff --git a/bower.json b/bower.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "lato-googlefont": "*",
-    "robotoslab-googlefont": "*",
     "font-awesome": "~4.7"
   },
   "resolutions": {

diff --git a/fonts/RobotoSlab/roboto-slab-v7-bold.eot b/fonts/RobotoSlab/roboto-slab-v7-bold.eot
diff --git a/fonts/RobotoSlab/roboto-slab-v7-bold.ttf b/fonts/RobotoSlab/roboto-slab-v7-bold.ttf
diff --git a/fonts/RobotoSlab/roboto-slab-v7-bold.woff b/fonts/RobotoSlab/roboto-slab-v7-bold.woff
diff --git a/fonts/RobotoSlab/roboto-slab-v7-bold.woff2 b/fonts/RobotoSlab/roboto-slab-v7-bold.woff2
diff --git a/fonts/RobotoSlab/roboto-slab-v7-regular.eot b/fonts/RobotoSlab/roboto-slab-v7-regular.eot
diff --git a/fonts/RobotoSlab/roboto-slab-v7-regular.ttf b/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
diff --git a/fonts/RobotoSlab/roboto-slab-v7-regular.woff b/fonts/RobotoSlab/roboto-slab-v7-regular.woff
diff --git a/fonts/RobotoSlab/roboto-slab-v7-regular.woff2 b/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
diff --git a/sass/_theme_font_local.sass b/sass/_theme_font_local.sass
@@ -26,11 +26,12 @@
   font-family: 'Roboto Slab'
   font-style: normal
   font-weight: 400
-  src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'), url(../fonts/RobotoSlab-Regular.ttf) format('truetype')
+  src: url('../fonts/RobotoSlab/roboto-slab.eot')
+  src: url('../fonts/RobotoSlab/roboto-slab-v7-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/RobotoSlab/roboto-slab-v7-regular.woff2') format('woff2'), url('../fonts/RobotoSlab/roboto-slab-v7-regular.woff') format('woff'), url('../fonts/RobotoSlab/roboto-slab-v7-regular.ttf') format('truetype')
 
-@font-face 
+@font-face
   font-family: 'Roboto Slab'
   font-style: normal
   font-weight: 700
-  src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(../fonts/RobotoSlab-Bold.ttf) format('truetype')
-
+  src: url('../fonts/RobotoSlab/roboto-slab-v7-bold.eot')
+  src: url('../fonts/RobotoSlab/roboto-slab-v7-bold.eot?#iefix') format('embedded-opentype'), url('../fonts/RobotoSlab/roboto-slab-v7-bold.woff2') format('woff2'), url('../fonts/RobotoSlab/roboto-slab-v7-bold.woff') format('woff'), url('../fonts/RobotoSlab/roboto-slab-v7-bold.ttf') format('truetype')