Skip to content

Commit

Permalink
Change Lato font to webfont (version 2.015) (#639)
Browse files Browse the repository at this point in the history
* Change Lato font to webfont version 2.015

* Fix missing eot, woff and woff2 statement for Lato regular

* Remove reference to non-existing SVG font
  • Loading branch information
jessetan authored and Blendify committed May 24, 2018
1 parent 9fdadd5 commit 0051b91
Show file tree
Hide file tree
Showing 20 changed files with 19 additions and 25 deletions.
7 changes: 2 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ module.exports = function(grunt) {
{
expand: true,
flatten: true,
src: ['bower_components/lato-googlefont/Lato-Regular.ttf',
'bower_components/lato-googlefont/Lato-Italic.ttf',
'bower_components/lato-googlefont/Lato-Bold.ttf',
'bower_components/lato-googlefont/Lato-BoldItalic.ttf'],
dest: 'sphinx_rtd_theme/static/fonts/',
src: ['fonts/Lato/*'],
dest: 'sphinx_rtd_theme/static/fonts/Lato',
filter: 'isFile'
},
{
Expand Down
12 changes: 3 additions & 9 deletions OFL-License.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
sphinx_rtd_theme/static/fonts/Lato/*



Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
with Reserved Font Name <Reserved Font Name>.
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
with Reserved Font Name <additional Reserved Font Name>.
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com),
with Reserved Font Name Lato.

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:
Expand Down
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"wyrm": "~1.0.x"
},
"dependencies": {
"lato-googlefont": "*",
"font-awesome": "~4.7"
},
"resolutions": {
Expand Down
Binary file added fonts/Lato/lato-bold.eot
Binary file not shown.
Binary file added fonts/Lato/lato-bold.ttf
Binary file not shown.
Binary file added fonts/Lato/lato-bold.woff
Binary file not shown.
Binary file added fonts/Lato/lato-bold.woff2
Binary file not shown.
Binary file added fonts/Lato/lato-bolditalic.eot
Binary file not shown.
Binary file added fonts/Lato/lato-bolditalic.ttf
Binary file not shown.
Binary file added fonts/Lato/lato-bolditalic.woff
Binary file not shown.
Binary file added fonts/Lato/lato-bolditalic.woff2
Binary file not shown.
Binary file added fonts/Lato/lato-italic.eot
Binary file not shown.
Binary file added fonts/Lato/lato-italic.ttf
Binary file not shown.
Binary file added fonts/Lato/lato-italic.woff
Binary file not shown.
Binary file added fonts/Lato/lato-italic.woff2
Binary file not shown.
Binary file added fonts/Lato/lato-regular.eot
Binary file not shown.
Binary file added fonts/Lato/lato-regular.ttf
Binary file not shown.
Binary file added fonts/Lato/lato-regular.woff
Binary file not shown.
Binary file added fonts/Lato/lato-regular.woff2
Binary file not shown.
24 changes: 14 additions & 10 deletions sass/_theme_font_local.sass
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
@font-face
font-family: 'Lato'
font-style: normal
src: url('../fonts/Lato/lato-regular.eot')
src: url('../fonts/Lato/lato-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Lato/lato-regular.woff2') format('woff2'), url('../fonts/Lato/lato-regular.woff') format('woff'), url('../fonts/Lato/lato-regular.ttf') format('truetype')
font-weight: 400
src: local('Lato Regular'), local('Lato-Regular'), url(../fonts/Lato-Regular.ttf) format('truetype')
font-style: normal

@font-face
font-family: 'Lato'
font-style: normal
src: url('../fonts/Lato/lato-bold.eot')
src: url('../fonts/Lato/lato-bold.eot?#iefix') format('embedded-opentype'), url('../fonts/Lato/lato-bold.woff2') format('woff2'), url('../fonts/Lato/lato-bold.woff') format('woff'), url('../fonts/Lato/lato-bold.ttf') format('truetype')
font-weight: 700
src: local('Lato Bold'), local('Lato-Bold'), url(../fonts/Lato-Bold.ttf) format('truetype')
font-style: normal


@font-face
font-family: 'Lato'
src: url('../fonts/Lato/lato-bolditalic.eot')
src: url('../fonts/Lato/lato-bolditalic.eot?#iefix') format('embedded-opentype'), url('../fonts/Lato/lato-bolditalic.woff2') format('woff2'), url('../fonts/Lato/lato-bolditalic.woff') format('woff'), url('../fonts/Lato/lato-bolditalic.ttf') format('truetype')
font-weight: 700
font-style: italic
font-weight: 400
src: local('Lato Italic'), local('Lato-Italic'), url(../fonts/Lato-Italic.ttf) format('truetype')

@font-face
font-family: 'Lato'
src: url('../fonts/Lato/lato-italic.eot')
src: url('../fonts/Lato/lato-italic.eot?#iefix') format('embedded-opentype'), url('../fonts/Lato/lato-italic.woff2') format('woff2'), url('../fonts/Lato/lato-italic.woff') format('woff'), url('../fonts/Lato/lato-italic.ttf') format('truetype')
font-weight: 400
font-style: italic
font-weight: 700
src: local('Lato Bold Italic'), local('Lato-BoldItalic'), url(../fonts/Lato-BoldItalic.ttf) format('truetype')

@font-face
font-family: 'Roboto Slab'
Expand All @@ -33,5 +38,4 @@
font-family: 'Roboto Slab'
font-style: normal
font-weight: 700
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')
src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(../fonts/RobotoSlab-Bold.ttf) format('truetype')

0 comments on commit 0051b91

Please sign in to comment.