Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docutils 0.18 issue fixes #1351

Closed
wants to merge 17 commits into from
Closed

Docutils 0.18 issue fixes #1351

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bc05685
Support docutils 0.18
edgarrmondragon Jul 19, 2022
55f7d70
Merge remote-tracking branch 'upstream/master' into HEAD
benjaoming Aug 19, 2022
30e6ffe
Merge remote-tracking branch 'upstream/master' into HEAD
benjaoming Aug 19, 2022
d278e3b
Add new Sphinx versions to tox test matrix, but do not allow docutils…
benjaoming Aug 23, 2022
8bfc509
Stop py2 and py27 support from sphinxlatest because of build breakage
benjaoming Aug 23, 2022
67cbb56
Circle CI: Repeat sphinx versions for Python 2.7 (pending adjustments)
benjaoming Aug 23, 2022
db4981c
tox.ini config: Ensure that we are getting the expected Sphinx version
benjaoming Aug 23, 2022
02c46ba
Merge branch 'master' of github.com:readthedocs/sphinx_rtd_theme into…
benjaoming Aug 24, 2022
49ddc86
Adds the exact approach from Fury, adjustments pending, credits @prad…
benjaoming Oct 5, 2022
bcfbfc8
Merge branch 'master' of github.com:readthedocs/sphinx_rtd_theme into…
benjaoming Oct 5, 2022
48b1cd5
Merge branch 'docutils-0.18' into docutils-0.18-issue-fixes
benjaoming Oct 5, 2022
bddcb77
Adds SASS rules for aside.footnote to match former footnote font colo…
benjaoming Oct 5, 2022
11a1bd5
Update theme.css for https://github.com/readthedocs/sphinx_rtd_theme/…
benjaoming Oct 5, 2022
c8d26b2
Merge branch 'master' of github.com:readthedocs/sphinx_rtd_theme into…
benjaoming Nov 14, 2022
80a4e90
Update theme.css after master branch merge
benjaoming Nov 14, 2022
bed86c5
Update styling fo rdocutils 0.18 DOM to look close to previous docuti…
benjaoming Nov 14, 2022
249b198
New release of sphinxcontrib-httpdomain==1.8.1 broke tests
benjaoming Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ packages = sphinx_rtd_theme
python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
install_requires =
sphinx >=1.6,<6
docutils <0.18
docutils <0.19
tests_require =
pytest

Expand Down
2 changes: 1 addition & 1 deletion sphinx_rtd_theme/static/css/theme.css
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 23 additions & 2 deletions src/sass/_theme_rst.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,30 @@
dl.option-list
kbd
font-size: 0.9rem

// docutils >= 0.18
aside.footnote,
div.citation
font-size: 0.9rem
p, span.label
font-size: 0.9rem

aside.footnote > span,
div.citation > span
font-weight: 500

aside.footnote > p,
div.citation > p
margin-left: 2rem

// Both
html.writer-html4 & table.docutils.citation, table.docutils.footnote,
html.writer-html5 & dl.footnote, dl.citation
html.writer-html4 & table.docutils.citation,
html.writer-html4 & table.docutils.footnote,
html.writer-html5 & dl.footnote,
html.writer-html5 & dl.citation,
// For some odd reason, with docutils 0.18, this is a div.citation not aside.citation
html.writer-html5 & div.citation,
html.writer-html5 & aside.footnote
color: $text-medium
code
color: $gray
Expand Down