Repository navigation
Default to the fuma theme and layer per-theme CSS - #165
Merged
Merged
Conversation
Use fuma (sphinx-fuma) when no theme is configured, in both the docs and wiki configuration generators. furo stays a core dependency and bundled theme so its preview still builds. Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Contributor
Test Results119 tests +2 119 ✅ +2 33s ⏱️ -1s Results for commit f942c03. ± Comparison against base commit 4f3d959. This pull request removes 4 and adds 6 tests. Note that renamed tests count towards both.♻️ This comment has been updated with latest results. |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #165 +/- ##
==========================================
+ Coverage 88.92% 89.02% +0.10%
==========================================
Files 16 16
Lines 2068 2096 +28
Branches 212 214 +2
==========================================
+ Hits 1839 1866 +27
Misses 160 160
- Partials 69 70 +1 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Resolution used to replace the bundled generic custom.css with {theme}.css, so
fuma builds lost the theme-agnostic rules and klink had to inherit furo's
attribute-driven ones. Write the generic file first and append {theme}.css when
the theme ships one, and move furo's layout and data-theme rules into furo.css.
Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
timkpaine
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description
Two related changes.
Default theme: unconfigured builds now resolve to
fuma(sphinx-fuma) in both the docs and wiki configuration generators, so thesphinx_fumaextension is registered and the bundledfuma.cssapplies.furostays a core dependency and bundled theme, soyardang previewstill builds and publishes previews for every theme.Bundled CSS/JS: resolution used to replace the bundled generic
custom.csswith a per-theme{theme}.css, so exactly one file was ever written. With fuma as the default, that meant fuma builds dropped the theme-agnostic rules incustom.css, andklinkinherited furo's attribute-driven ones. The generic file is now always written and the per-theme file is appended when the theme ships one. furo's layout anddata-themerules move to a newfuro.css, leavingcustom.cssas the generic base. The parsed rule set for furo is unchanged. An explicitcustom-css/custom-jsvalue still replaces both, and the output path (_static/styles/custom.css) is unchanged.Type of Change
Checklist
make lint)make test)Local test run: 118 of 119 pass.
yardang/tests/test_all.py::test_clifails in this environment because the optionalsphinxcontrib_rustextra is not installed; it fails identically withtheme="furo", so it is unrelated to these changes.