Allow specifying multiple CSS files in themes #10465
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es via "stylesheet" setting
|
Thanks @tk0miya, this works great! Since html_style can be used to overwrite this, wouldn't it make sense to extend |
AA-Turner
requested changes
May 27, 2022
sphinx/builders/html/__init__.py
Outdated
Comment on lines
275
to
282
| def get_style_filenames(self) -> str: | ||
| if self.config.html_style is not None: | ||
| return [self.config.html_style] | ||
| elif self.theme: | ||
| stylesheet = self.theme.get_config('theme', 'stylesheet') | ||
| return [s.strip() for s in stylesheet.split(',')] | ||
| else: | ||
| return ['default.css'] |
There was a problem hiding this comment.
Suggested change
| def get_style_filenames(self) -> str: | |
| if self.config.html_style is not None: | |
| return [self.config.html_style] | |
| elif self.theme: | |
| stylesheet = self.theme.get_config('theme', 'stylesheet') | |
| return [s.strip() for s in stylesheet.split(',')] | |
| else: | |
| return ['default.css'] | |
| def _get_style_filenames(self) -> Iterator[str]: | |
| if isinstance(self.config.html_style, str): | |
| yield self.config.html_style | |
| elif self.config.html_style is not None: | |
| yield from self.config.html_style | |
| elif self.theme: | |
| stylesheet = self.theme.get_config('theme', 'stylesheet') | |
| yield from (s.strip() for s in stylesheet.split(', ')) | |
| else: | |
| yield 'default.css' |
sphinx/builders/html/__init__.py
Outdated
| @@ -309,7 +318,9 @@ def init_highlighter(self) -> None: | |||
| def init_css_files(self) -> None: | |||
| self.css_files = [] | |||
| self.add_css_file('pygments.css', priority=200) | |||
| self.add_css_file(self._get_style_filename(), priority=200) | |||
|
|
|||
| for filename in self.get_style_filenames(): | |||
There was a problem hiding this comment.
Suggested change
| for filename in self.get_style_filenames(): | |
| for filename in self._get_style_filenames(): |
CHANGES
Outdated
Comment on lines
16
to
17
| * #10444: html theme: Allow to specify multiple CSS files via ``stylesheet`` | ||
| setting on ``theme.conf`` |
There was a problem hiding this comment.
Suggested change
| * #10444: html theme: Allow to specify multiple CSS files via ``stylesheet`` | |
| setting on ``theme.conf`` | |
| * #10444: html theme: Allow specifying multiple CSS files through the ``stylesheet`` | |
| setting in ``theme.conf`` or by setting ``html_style`` to an iterable of strings. |
# Conflicts: # doc/templating.rst # sphinx/builders/html/__init__.py # tests/test_build_html.py
AA-Turner
changed the title
AA-Turner
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Feature or Bugfix
Purpose