Merge branch 'master' into docutils0.17.1

docs/changelog.rst

@@ -2,11 +2,10 @@
 Changelog
 *********
 
-master
+Development version (|development_version|)
-======
+===========================================
 
-v1.0.0
+.. |development_version| replace:: 1.0.0alpha1
-======
 
 Incompatible Changes
 --------------------

docs/contributing.rst

@@ -197,4 +197,8 @@ To release a new version of the theme, core team will take the following steps:
       $ python setup.py sdist bdist_wheel
       $ twine upload --sign --identity security@readthedocs.org dist/*
 
+#. Finally, open a new pull request updating the development release version to
+   the next patch by running ``bump2version patch``. Open a pull request with
+   this change.
+
 .. _PEP440: https://www.python.org/dev/peps/pep-0440/

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "sphinx_rtd_theme",
-  "version": "0.5.2",
+  "version": "1.0.0alpha1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2809,7 +2809,7 @@
       }
     },
     "fresh": {
-      "version": "0.5.2",
+      "version": "1.0.0alpha1",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
       "dev": true

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sphinx_rtd_theme",
   "main": "js/theme.js",
-  "version": "0.5.2",
+  "version": "1.0.0alpha1",
   "scripts": {
     "dev": "webpack-dev-server --open --config webpack.dev.js",
     "build": "webpack --config webpack.prod.js",

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.2
+current_version = 1.0.0alpha1
 commit = false
 tag = false
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?
@@ -53,4 +53,6 @@ replace = "version": "{new_version}",
 search = "version": "{current_version}",
 replace = "version": "{new_version}",
 
-[bumpversion:file:docs/conf.py]
+[bumpversion:file:docs/changelog.rst]
+search = .. |development_version| replace:: {current_version}
+replace = .. |development_version| replace:: {new_version}

setup.py

@@ -87,7 +87,7 @@ class TransifexCommand(distutils.cmd.Command):
 
 setup(
     name='sphinx_rtd_theme',
-    version='0.5.2',
+    version='1.0.0alpha1',
     url='https://github.com/readthedocs/sphinx_rtd_theme',
     license='MIT',
     author='Dave Snider, Read the Docs, Inc. & contributors',

sphinx_rtd_theme/__init__.py

@@ -12,7 +12,7 @@ from sphinx.locale import _
 from sphinx.util.logging import getLogger
 
 
-__version__ = '0.5.2'
+__version__ = '1.0.0alpha1'
 __version_full__ = __version__
 
 logger = getLogger(__name__)

sphinx_rtd_theme/footer.html

@@ -53,7 +53,7 @@
     {#- Translators: "theme" refers to a theme for Sphinx, which alters the appearance of the generated documenation #}
     <a href="https://github.com/readthedocs/sphinx_rtd_theme">{% trans %}theme{% endtrans %}</a>
     {#- Translators: this is always used as "provided by Read the Docs", and should not imply Read the Docs is an author of the generated documentation. #}
-    {%- trans %}provided by {{ readthedocs_web }}{% endtrans %}.
+    {% trans %}provided by {{ readthedocs_web }}{% endtrans %}.
   {% endif %}
 
   {%- block extrafooter %} {% endblock %}

src/sass/_theme_rst.sass

@@ -213,7 +213,7 @@
     @extend h2
 
   // This is the #href that shows up on hover. Sphinx's is terrible so I hack it away.
-  h1, h2, h3, h4, h5, h6, dl dt, p, p.caption, table > caption, .code-block-caption
+  h1, h2, h3, h4, h5, h6, dl dt, p, p.caption, table > caption, .code-block-caption, .eqno
     .headerlink
       opacity: 0
       font-size: 14px
@@ -277,6 +277,15 @@
   .hlist
     width: 100%
 
+  // Definition lists term/classifier separator
+  // Adds a separator for Sphinx > 1.x as a pseudo-element
+  // and hides the hardcoded separator from Sphinx 1.x
+  dl dt span.classifier
+    &:before
+      content: " : "
+  dl dt span.classifier-delimiter
+    display: none !important
+
   // The html4 writer outputs the citation and footnotes as a table, and the
   // html5 writer outputs these as a definition list. We will use the fairly
   // well supported css `grid` attribute to make these back into a table
@@ -295,9 +304,6 @@
         vertical-align: top
   // HTML5 writer
   html.writer-html5 &
-    dl dt span.classifier
-      &:before
-        content: " : "
     dl.footnote,
     dl.field-list
       display: grid