Merge pull request readthedocs#649 from rtfd/version-0.4.0

Version 0.4.0 updates
WiWaG · Jun 6, 2018 · 5a16288 · 5a16288
2 parents 53e2a78 + 69fafa2
commit 5a16288
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,10 +6,13 @@
 .coverage
 *.DS_Store
 *.sass-cache
+*.map
 .ropeproject/
 .ruby-version
 dist/
 bower_components/
 node_modules
 npm-debug.log
 package-lock.json
+sphinx_rtd_theme/static/fonts/Lato/
+sphinx_rtd_theme/static/fonts/RobotoSlab/
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "sphinx-rtd-theme",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "homepage": "https://github.com/rtfd/sphinx_rtd_theme",
   "authors": [
     "Dave Snider, Read the Docs, Inc. & contributors <[email protected]>"

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,9 +3,13 @@
 Changelog
 *********
 
-Master
+v0.4.0
 ======
 
+This version made some changes to how JS and CSS were included
+when the theme is used on Read the Docs.
+
+
 New Features
 -------------
 

diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -73,8 +73,9 @@ Releasing the Theme
 When you release a new version,
 you should do the following:
 
-#. Bump the version in ``sphinx_rtd_theme/__init__.py`` --
+#. Bump the version in ``sphinx_rtd_theme/__init__.py``, ``bower.json`` and ``package.json`` --
    we try to follow `semver <http://semver.org/>`_, so be careful with breaking changes.
+#. Update the changelog (``docs/changelog.rst``) with the version information.
 #. Run a ``grunt build`` to rebuild all the theme assets.
 #. Commit that change.
 #. Tag the release in git: ``git tag $NEW_VERSION``.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sphinx_rtd_theme",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "private": true,
   "devDependencies": {
     "bower": "^1.8.4",

diff --git a/sass/_theme_font_local.sass b/sass/_theme_font_local.sass
@@ -38,4 +38,5 @@
   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')
diff --git a/sphinx_rtd_theme/__init__.py b/sphinx_rtd_theme/__init__.py
@@ -5,7 +5,7 @@
 """
 from os import path
 
-__version__ = '0.3.1'
+__version__ = '0.4.0'
 __version_full__ = __version__
 
 

diff --git a/sphinx_rtd_theme/static/css/theme.css b/sphinx_rtd_theme/static/css/theme.css
diff --git a/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf b/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
diff --git a/sphinx_rtd_theme/static/fonts/Lato-BoldItalic.ttf b/sphinx_rtd_theme/static/fonts/Lato-BoldItalic.ttf
diff --git a/sphinx_rtd_theme/static/fonts/Lato-Italic.ttf b/sphinx_rtd_theme/static/fonts/Lato-Italic.ttf
diff --git a/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf b/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
diff --git a/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf b/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
diff --git a/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf b/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf
diff --git a/sphinx_rtd_theme/static/js/theme.js b/sphinx_rtd_theme/static/js/theme.js