Switch to a native code font stack

This commit is contained in:
David Fischer 2018-04-16 16:43:30 -07:00
parent 7cd846b4fd
commit a233c9fb7d
No known key found for this signature in database
GPG Key ID: F0C9B0ADA737AB60
7 changed files with 103 additions and 126 deletions

View File

@ -46,14 +46,6 @@ module.exports = function(grunt) {
'bower_components/robotoslab-googlefont/RobotoSlab-Regular.ttf'], 'bower_components/robotoslab-googlefont/RobotoSlab-Regular.ttf'],
dest: 'sphinx_rtd_theme/static/fonts/', dest: 'sphinx_rtd_theme/static/fonts/',
filter: 'isFile' filter: 'isFile'
},
{
expand: true,
flatten: true,
src: ['bower_components/inconsolata-googlefont/Inconsolata-Bold.ttf',
'bower_components/inconsolata-googlefont/Inconsolata-Regular.ttf'],
dest: 'sphinx_rtd_theme/static/fonts/',
filter: 'isFile'
} }
] ]
} }

View File

@ -1,104 +1,102 @@
sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
sphinx_rtd_theme/static/fonts/Lato-Bold.ttf sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
sphinx_rtd_theme/static/fonts/Inconsolata.ttf
sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
with Reserved Font Name <Reserved Font Name>.
Copyright (c) <dates>, <Copyright Holder> (<URL|email>), Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
with Reserved Font Name <Reserved Font Name>. with Reserved Font Name <additional Reserved Font Name>.
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>), Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
with Reserved Font Name <additional Reserved Font Name>.
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>). 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:
This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/OFL
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
----------------------------------------------------------- -----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
----------------------------------------------------------- PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
PREAMBLE development of collaborative font projects, to support the font creation
The goals of the Open Font License (OFL) are to stimulate worldwide efforts of academic and linguistic communities, and to provide a free and
development of collaborative font projects, to support the font creation open framework in which fonts may be shared and improved in partnership
efforts of academic and linguistic communities, and to provide a free and with others.
open framework in which fonts may be shared and improved in partnership
with others. The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
The OFL allows the licensed fonts to be used, studied, modified and fonts, including any derivative works, can be bundled, embedded,
redistributed freely as long as they are not sold by themselves. The redistributed and/or sold with any software provided that any reserved
fonts, including any derivative works, can be bundled, embedded, names are not used by derivative works. The fonts and derivatives,
redistributed and/or sold with any software provided that any reserved however, cannot be released under any other type of license. The
names are not used by derivative works. The fonts and derivatives, requirement for fonts to remain under this license does not apply
however, cannot be released under any other type of license. The to any document created using the fonts or their derivatives.
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives. DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
DEFINITIONS Holder(s) under this license and clearly marked as such. This may
"Font Software" refers to the set of files released by the Copyright include source files, build scripts and documentation.
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation. "Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s). "Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s). "Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
"Modified Version" refers to any derivative made by adding to, deleting, Original Version, by changing formats or by porting the Font Software to a
or substituting -- in part or in whole -- any of the components of the new environment.
Original Version, by changing formats or by porting the Font Software to a
new environment. "Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software. PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
PERMISSION & CONDITIONS a copy of the Font Software, to use, study, copy, merge, embed, modify,
Permission is hereby granted, free of charge, to any person obtaining redistribute, and sell modified and unmodified copies of the Font
a copy of the Font Software, to use, study, copy, merge, embed, modify, Software, subject to the following conditions:
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions: 1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself. 2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
2) Original or Modified Versions of the Font Software may be bundled, contains the above copyright notice and this license. These can be
redistributed and/or sold with any software, provided that each copy included either as stand-alone text files, human-readable headers or
contains the above copyright notice and this license. These can be in the appropriate machine-readable metadata fields within text or
included either as stand-alone text files, human-readable headers or binary files as long as those fields can be easily viewed by the user.
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user. 3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
3) No Modified Version of the Font Software may use the Reserved Font Copyright Holder. This restriction only applies to the primary font name as
Name(s) unless explicit written permission is granted by the corresponding presented to the users.
Copyright Holder. This restriction only applies to the primary font name as
presented to the users. 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Modified Version, except to acknowledge the contribution(s) of the
Software shall not be used to promote, endorse or advertise any Copyright Holder(s) and the Author(s) or with their explicit written
Modified Version, except to acknowledge the contribution(s) of the permission.
Copyright Holder(s) and the Author(s) or with their explicit written
permission. 5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
5) The Font Software, modified or unmodified, in part or in whole, distributed under any other license. The requirement for fonts to
must be distributed entirely under this license, and must not be remain under this license does not apply to any document created
distributed under any other license. The requirement for fonts to using the Font Software.
remain under this license does not apply to any document created
using the Font Software. TERMINATION
This license becomes null and void if any of the above conditions are
TERMINATION not met.
This license becomes null and void if any of the above conditions are
not met. DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
DISCLAIMER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING OTHER DEALINGS IN THE FONT SOFTWARE.
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

View File

@ -31,7 +31,6 @@
"dependencies": { "dependencies": {
"lato-googlefont": "*", "lato-googlefont": "*",
"robotoslab-googlefont": "*", "robotoslab-googlefont": "*",
"inconsolata-googlefont": "*",
"font-awesome": "~4.7" "font-awesome": "~4.7"
}, },
"resolutions": { "resolutions": {

View File

@ -1,15 +1,3 @@
@font-face
font-family: 'Inconsolata'
font-style: normal
font-weight: 400
src: local('Inconsolata'), local('Inconsolata-Regular'), url(../fonts/Inconsolata-Regular.ttf) format('truetype')
@font-face
font-family: 'Inconsolata'
font-style: normal
font-weight: 700
src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url(../fonts/Inconsolata-Bold.ttf) format('truetype')
@font-face @font-face
font-family: 'Lato' font-family: 'Lato'
font-style: normal font-style: normal

View File

@ -63,4 +63,4 @@ $highlight-color: $yellow
$base-font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif $base-font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif
$custom-font-family: "Roboto Slab", "ff-tisa-web-pro", "Georgia", Arial, sans-serif $custom-font-family: "Roboto Slab", "ff-tisa-web-pro", "Georgia", Arial, sans-serif
$custom-font-family2: Georgia, serif $custom-font-family2: Georgia, serif
$code-font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace $code-font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", Courier, monospace