Merge branch 'master' into remove-extra_css_files

Bump for next potential release, 2.0.0rc5 (#1539 )
Release 2.0.0rc4 (#1538 )
2026-10-15 02:42:01 -05:00 · 2023-11-15 14:10:45 -05:00 · 2023-10-31 14:27:11 -07:00 · 2023-10-31 14:15:47 -07:00 · 2023-10-30 11:41:11 -07:00 · 2023-10-24 11:49:43 -07:00
7 changed files with 12 additions and 13 deletions
@@ -4,11 +4,11 @@ Changelog

 .. seealso:: :ref:`howto_upgrade`

-.. |theme_version| replace:: 2.0.0rc3
+.. |theme_version| replace:: 2.0.0rc5

 .. _release-2.0.0:

-2.0.0rc2
+2.0.0rc4
 ========

 Added
@@ -1,6 +1,6 @@
 {
  "name": "sphinx_rtd_theme",
-  "version": "2.0.0rc3",
+  "version": "2.0.0rc5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1,7 +1,7 @@
 {
  "name": "sphinx_rtd_theme",
  "main": "js/theme.js",
-  "version": "2.0.0rc3",
+  "version": "2.0.0rc5",
  "scripts": {
    "dev": "webpack-dev-server --open --config webpack.dev.js",
    "build": "webpack --config webpack.prod.js",
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0rc3
+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+))?
@@ -86,7 +86,7 @@ class TransifexCommand(distutils.cmd.Command):


 setup(
-    version='2.0.0rc3',
+    version='2.0.0rc5',
    cmdclass={
        'update_translations': UpdateTranslationsCommand,
        'transifex': TransifexCommand,
@@ -12,7 +12,7 @@ from sphinx.locale import _
 from sphinx.util.logging import getLogger


-__version__ = '2.0.0rc3'
+__version__ = '2.0.0rc5'
 __version_full__ = __version__

 logger = getLogger(__name__)
@@ -29,14 +29,13 @@
    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
  {%- endif %}
  {%- for css_file in css_files %}
-    {{ css_tag(css_file) }}
+    {%- if css_file|attr("filename") %}
+      {{ css_tag(css_file) }}
+    {%- else %}
+      <link rel="stylesheet" href="{{ pathto(css_file, 1)|escape }}" type="text/css" />
+    {%- 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.
Author	SHA1	Message	Date
Aaron Carlisle	e0c87a6e7e	Merge branch 'master' into remove-extra_css_files	2023-11-15 14:10:45 -05:00
Anthony	c104410760	Bump for next potential release, 2.0.0rc5 (#1539 )	2023-10-31 14:27:11 -07:00
Anthony	53ca116ef6	Release 2.0.0rc4 (#1538 )	2023-10-31 14:15:47 -07:00
Dmitry Shachnev	4498e97b46	Fix AttributeError when one of `css_files` is a string (#1537 ) Fix AttributeError when one of css_files is a string	2023-10-30 11:41:11 -07:00
Anthony	84aea9b0ba	Increment for next potential release (#1536 )	2023-10-24 11:49:43 -07:00
Anthony	febde39c7c	Release 2.0.0rc3 (#1535 )	2023-10-23 19:12:58 -07:00
Mathieu Leplatre Manuel Kaufmann Anthony Johnson	32310a8190	Fix #1522 : fix `'str' object has no attribute 'attributes'` (#1528 ) * Fix #1522: fix attribute error if css is str * Revert "Fix #1522: fix attribute error if css is str" This reverts commit `b22a77f35a`. * Use `css_tag` only for standard CSS files from Sphinx ... and keep using the custom `link` HTML tag for CSS files included via the HTML theme option `extra_css_files`. * Normalize template variables --------- Co-authored-by: Manuel Kaufmann <humitos@gmail.com> Co-authored-by: Anthony Johnson <aj@ohess.org>	2023-10-23 19:05:59 -07:00
Aaron Carlisle	1dcad7c077	Merge branch 'master' into remove-extra_css_files	2021-03-22 22:09:57 -04:00
Aaron Carlisle	ba046c0dad	Merge branch 'master' into remove-extra_css_files	2017-11-30 12:36:12 -05:00
Aaron Carlisle	edf3b18408	Merge branch 'master' into remove-extra_css_files	2017-11-26 17:16:10 -05:00
Aaron Carlisle	78440cf9c3	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.	2017-07-30 19:36:20 -04:00