Skip to content

Commit 4b45725

Browse files
davidfischerdavidfischer
authored
Merge branch 'master' into always-bundle-js-css
2 parents 92f0065 + 0051b91 commit 4b45725

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+219
-171
lines changed

‎.gitattributes‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Document global line endings settings
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
* text eol=lf
4+
5+
6+
# Denote all files that are truly binary and should not be modified.
7+
*.ai binary
8+
*.jpg binary
9+
*.otf binary
10+
*.png binary
11+
*.eot binary
12+
*.ttf binary
13+
*.whl binary
14+
*.woff binary
15+
*.woff2 binary

‎Apache-License-2.0.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
2-
sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.tt/
1+
/fonts/RobotoSlab/*
32

43

54
Apache License

‎Gruntfile.js‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ module.exports = function(grunt) {
44
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
55

66
grunt.initConfig({
7+
// Read package.json
8+
pkg: grunt.file.readJSON("package.json"),
9+
710
open : {
811
dev: {
912
path: 'http://localhost:1919'
@@ -32,27 +35,15 @@ module.exports = function(grunt) {
3235
{
3336
expand: true,
3437
flatten: true,
35-
src: ['bower_components/lato-googlefont/Lato-Regular.ttf',
36-
'bower_components/lato-googlefont/Lato-Italic.ttf',
37-
'bower_components/lato-googlefont/Lato-Bold.ttf',
38-
'bower_components/lato-googlefont/Lato-BoldItalic.ttf'],
39-
dest: 'sphinx_rtd_theme/static/fonts/',
38+
src: ['fonts/Lato/*'],
39+
dest: 'sphinx_rtd_theme/static/fonts/Lato',
4040
filter: 'isFile'
4141
},
4242
{
4343
expand: true,
4444
flatten: true,
45-
src: ['bower_components/robotoslab-googlefont/RobotoSlab-Bold.ttf',
46-
'bower_components/robotoslab-googlefont/RobotoSlab-Regular.ttf'],
47-
dest: 'sphinx_rtd_theme/static/fonts/',
48-
filter: 'isFile'
49-
},
50-
{
51-
expand: true,
52-
flatten: true,
53-
src: ['bower_components/inconsolata-googlefont/Inconsolata-Bold.ttf',
54-
'bower_components/inconsolata-googlefont/Inconsolata-Regular.ttf'],
55-
dest: 'sphinx_rtd_theme/static/fonts/',
45+
src: ['fonts/RobotoSlab/*'],
46+
dest: 'sphinx_rtd_theme/static/fonts/RobotoSlab/',
5647
filter: 'isFile'
5748
}
5849
]
@@ -131,6 +122,19 @@ module.exports = function(grunt) {
131122
}]
132123
}
133124
},
125+
usebanner: {
126+
dist: {
127+
options: {
128+
position: 'top',
129+
banner: '/* <%= pkg.name %> version <%= pkg.version %> | MIT license */\n' +
130+
'/* Built <%= grunt.template.today("yyyymmdd HH:mm") %> */',
131+
linebreak: true
132+
},
133+
files: {
134+
src: [ 'sphinx_rtd_theme/static/js/theme.js', 'sphinx_rtd_theme/static/css/theme.css' ]
135+
}
136+
}
137+
},
134138
exec: {
135139
bower_update: {
136140
cmd: 'bower update'
@@ -180,6 +184,6 @@ module.exports = function(grunt) {
180184
grunt.loadNpmTasks('grunt-open');
181185
grunt.loadNpmTasks('grunt-browserify');
182186

183-
grunt.registerTask('default', ['exec:bower_update','clean','copy:fonts','sass:dev','browserify:dev','exec:build_sphinx','connect','open','watch']);
184-
grunt.registerTask('build', ['exec:bower_update','clean','copy:fonts','sass:build','browserify:build','uglify','exec:build_sphinx']);
187+
grunt.registerTask('default', ['exec:bower_update','clean','copy:fonts','sass:dev','browserify:dev','usebanner','exec:build_sphinx','connect','open','watch']);
188+
grunt.registerTask('build', ['exec:bower_update','clean','copy:fonts','sass:build','browserify:build','uglify','usebanner','exec:build_sphinx']);
185189
}

‎OFL-License.txt‎

Lines changed: 96 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,96 @@
1-
sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
2-
sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
3-
sphinx_rtd_theme/static/fonts/Inconsolata.ttf
4-
sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
5-
6-
7-
8-
Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
9-
with Reserved Font Name <Reserved Font Name>.
10-
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
11-
with Reserved Font Name <additional Reserved Font Name>.
12-
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
13-
14-
This Font Software is licensed under the SIL Open Font License, Version 1.1.
15-
This license is copied below, and is also available with a FAQ at:
16-
http://scripts.sil.org/OFL
17-
18-
19-
-----------------------------------------------------------
20-
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
21-
-----------------------------------------------------------
22-
23-
PREAMBLE
24-
The goals of the Open Font License (OFL) are to stimulate worldwide
25-
development of collaborative font projects, to support the font creation
26-
efforts of academic and linguistic communities, and to provide a free and
27-
open framework in which fonts may be shared and improved in partnership
28-
with others.
29-
30-
The OFL allows the licensed fonts to be used, studied, modified and
31-
redistributed freely as long as they are not sold by themselves. The
32-
fonts, including any derivative works, can be bundled, embedded,
33-
redistributed and/or sold with any software provided that any reserved
34-
names are not used by derivative works. The fonts and derivatives,
35-
however, cannot be released under any other type of license. The
36-
requirement for fonts to remain under this license does not apply
37-
to any document created using the fonts or their derivatives.
38-
39-
DEFINITIONS
40-
"Font Software" refers to the set of files released by the Copyright
41-
Holder(s) under this license and clearly marked as such. This may
42-
include source files, build scripts and documentation.
43-
44-
"Reserved Font Name" refers to any names specified as such after the
45-
copyright statement(s).
46-
47-
"Original Version" refers to the collection of Font Software components as
48-
distributed by the Copyright Holder(s).
49-
50-
"Modified Version" refers to any derivative made by adding to, deleting,
51-
or substituting -- in part or in whole -- any of the components of the
52-
Original Version, by changing formats or by porting the Font Software to a
53-
new environment.
54-
55-
"Author" refers to any designer, engineer, programmer, technical
56-
writer or other person who contributed to the Font Software.
57-
58-
PERMISSION & CONDITIONS
59-
Permission is hereby granted, free of charge, to any person obtaining
60-
a copy of the Font Software, to use, study, copy, merge, embed, modify,
61-
redistribute, and sell modified and unmodified copies of the Font
62-
Software, subject to the following conditions:
63-
64-
1) Neither the Font Software nor any of its individual components,
65-
in Original or Modified Versions, may be sold by itself.
66-
67-
2) Original or Modified Versions of the Font Software may be bundled,
68-
redistributed and/or sold with any software, provided that each copy
69-
contains the above copyright notice and this license. These can be
70-
included either as stand-alone text files, human-readable headers or
71-
in the appropriate machine-readable metadata fields within text or
72-
binary files as long as those fields can be easily viewed by the user.
73-
74-
3) No Modified Version of the Font Software may use the Reserved Font
75-
Name(s) unless explicit written permission is granted by the corresponding
76-
Copyright Holder. This restriction only applies to the primary font name as
77-
presented to the users.
78-
79-
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
80-
Software shall not be used to promote, endorse or advertise any
81-
Modified Version, except to acknowledge the contribution(s) of the
82-
Copyright Holder(s) and the Author(s) or with their explicit written
83-
permission.
84-
85-
5) The Font Software, modified or unmodified, in part or in whole,
86-
must be distributed entirely under this license, and must not be
87-
distributed under any other license. The requirement for fonts to
88-
remain under this license does not apply to any document created
89-
using the Font Software.
90-
91-
TERMINATION
92-
This license becomes null and void if any of the above conditions are
93-
not met.
94-
95-
DISCLAIMER
96-
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
97-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
98-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
99-
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
100-
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
101-
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
102-
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
103-
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
104-
OTHER DEALINGS IN THE FONT SOFTWARE.
1+
sphinx_rtd_theme/static/fonts/Lato/*
2+
3+
Copyright (c) 2010-2015, Łukasz Dziedzic ([email protected]),
4+
with Reserved Font Name Lato.
5+
6+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
7+
This license is copied below, and is also available with a FAQ at:
8+
http://scripts.sil.org/OFL
9+
10+
11+
-----------------------------------------------------------
12+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
13+
-----------------------------------------------------------
14+
15+
PREAMBLE
16+
The goals of the Open Font License (OFL) are to stimulate worldwide
17+
development of collaborative font projects, to support the font creation
18+
efforts of academic and linguistic communities, and to provide a free and
19+
open framework in which fonts may be shared and improved in partnership
20+
with others.
21+
22+
The OFL allows the licensed fonts to be used, studied, modified and
23+
redistributed freely as long as they are not sold by themselves. The
24+
fonts, including any derivative works, can be bundled, embedded,
25+
redistributed and/or sold with any software provided that any reserved
26+
names are not used by derivative works. The fonts and derivatives,
27+
however, cannot be released under any other type of license. The
28+
requirement for fonts to remain under this license does not apply
29+
to any document created using the fonts or their derivatives.
30+
31+
DEFINITIONS
32+
"Font Software" refers to the set of files released by the Copyright
33+
Holder(s) under this license and clearly marked as such. This may
34+
include source files, build scripts and documentation.
35+
36+
"Reserved Font Name" refers to any names specified as such after the
37+
copyright statement(s).
38+
39+
"Original Version" refers to the collection of Font Software components as
40+
distributed by the Copyright Holder(s).
41+
42+
"Modified Version" refers to any derivative made by adding to, deleting,
43+
or substituting -- in part or in whole -- any of the components of the
44+
Original Version, by changing formats or by porting the Font Software to a
45+
new environment.
46+
47+
"Author" refers to any designer, engineer, programmer, technical
48+
writer or other person who contributed to the Font Software.
49+
50+
PERMISSION & CONDITIONS
51+
Permission is hereby granted, free of charge, to any person obtaining
52+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
53+
redistribute, and sell modified and unmodified copies of the Font
54+
Software, subject to the following conditions:
55+
56+
1) Neither the Font Software nor any of its individual components,
57+
in Original or Modified Versions, may be sold by itself.
58+
59+
2) Original or Modified Versions of the Font Software may be bundled,
60+
redistributed and/or sold with any software, provided that each copy
61+
contains the above copyright notice and this license. These can be
62+
included either as stand-alone text files, human-readable headers or
63+
in the appropriate machine-readable metadata fields within text or
64+
binary files as long as those fields can be easily viewed by the user.
65+
66+
3) No Modified Version of the Font Software may use the Reserved Font
67+
Name(s) unless explicit written permission is granted by the corresponding
68+
Copyright Holder. This restriction only applies to the primary font name as
69+
presented to the users.
70+
71+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
72+
Software shall not be used to promote, endorse or advertise any
73+
Modified Version, except to acknowledge the contribution(s) of the
74+
Copyright Holder(s) and the Author(s) or with their explicit written
75+
permission.
76+
77+
5) The Font Software, modified or unmodified, in part or in whole,
78+
must be distributed entirely under this license, and must not be
79+
distributed under any other license. The requirement for fonts to
80+
remain under this license does not apply to any document created
81+
using the Font Software.
82+
83+
TERMINATION
84+
This license becomes null and void if any of the above conditions are
85+
not met.
86+
87+
DISCLAIMER
88+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
89+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
90+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
91+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
92+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
93+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
94+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
95+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
96+
OTHER DEALINGS IN THE FONT SOFTWARE.

‎bower.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sphinx-rtd-theme",
3-
"version": "0.2.4",
3+
"version": "0.3.1",
44
"homepage": "https://github.com/rtfd/sphinx_rtd_theme",
55
"authors": [
66
"Dave Snider, Read the Docs, Inc. & contributors <[email protected]>"
@@ -29,9 +29,6 @@
2929
"wyrm": "~1.0.x"
3030
},
3131
"dependencies": {
32-
"lato-googlefont": "*",
33-
"robotoslab-googlefont": "*",
34-
"inconsolata-googlefont": "*",
3532
"font-awesome": "~4.7"
3633
},
3734
"resolutions": {

‎docs/changelog.rst‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Changelog
44
*********
55

6-
master
6+
Master
77
======
88

99
New Features
@@ -12,12 +12,28 @@ New Features
1212
Fixes
1313
-----
1414

15-
* Fix table centering (#599)
1615
* Do not rely on readthedocs.org for CSS/JS (#614)
16+
* Color accessibility improvements on the left navigation
1717

1818
Other Changes
1919
--------------
2020

21+
* Write theme version and build date at top of JavaScript and CSS
22+
* Changed code and literals to use a native font stack (#612)
23+
* Fix small styling issues
24+
25+
v0.3.1
26+
======
27+
28+
Fixes
29+
-----
30+
31+
* Revert part of #576 causing display issues with version selector menu
32+
* Backwards compatibility fixes for pre-0.3.0 releases (#623)
33+
* Fix mkdocs version selector (#622)
34+
* Add open list spacing (#591)
35+
* Fix table centering (#599)
36+
2137
v0.3.0
2238
======
2339

‎fonts/Lato/lato-bold.eot‎

250 KB
Binary file not shown.

‎fonts/Lato/lato-bold.ttf‎

587 KB
Binary file not shown.

‎fonts/Lato/lato-bold.woff‎

302 KB
Binary file not shown.

‎fonts/Lato/lato-bold.woff2‎

181 KB
Binary file not shown.

0 commit comments

Comments
 (0)