Merge branch 'master' into remove-extra_css_files

`extra_css_files` was add in https://github.com/rtfd/readthedocs.org/commit/e759c50697c5c9b210f5b7ea2978e24b25aef901 but serves no purpose (not sure why it was added intially) users should use `Sphinx.add_stylesheet` instead.

docs/changelog.rst

@@ -4,7 +4,7 @@ Changelog
 
 .. seealso:: :ref:`howto_upgrade`
 
-.. |theme_version| replace:: 2.0.0rc4
+.. |theme_version| replace:: 2.0.0rc5
 
 .. _release-2.0.0:
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "sphinx_rtd_theme",
-  "version": "2.0.0rc4",
+  "version": "2.0.0rc5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sphinx_rtd_theme",
   "main": "js/theme.js",
-  "version": "2.0.0rc4",
+  "version": "2.0.0rc5",
   "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 = 2.0.0rc4
+current_version = 2.0.0rc5
 commit = false
 tag = false
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?

setup.py

@@ -86,7 +86,7 @@ class TransifexCommand(distutils.cmd.Command):
 
 
 setup(
-    version='2.0.0rc4',
+    version='2.0.0rc5',
     cmdclass={
         'update_translations': UpdateTranslationsCommand,
         'transifex': TransifexCommand,

sphinx_rtd_theme/__init__.py

@@ -12,7 +12,7 @@ from sphinx.locale import _
 from sphinx.util.logging import getLogger
 
 
-__version__ = '2.0.0rc4'
+__version__ = '2.0.0rc5'
 __version_full__ = __version__
 
 logger = getLogger(__name__)

sphinx_rtd_theme/layout.html

@@ -36,11 +36,6 @@
     {%- endif %}
   {%- endfor %}
 
-  {# "extra_css_files" is a theme option and it's always a string #}
-  {%- for css_file in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
-  {%- endfor -%}
-
   {#- FAVICON
       favicon_url is the only context var necessary since Sphinx 4.
       In Sphinx<4, we use favicon but need to prepend path info.