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.

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

Address Sphinx 2 compatibility issues #838

Merged
merged 16 commits into from
May 5, 2020
Merged

Address Sphinx 2 compatibility issues #838

merged 16 commits into from
May 5, 2020

Conversation

agjohnson
Copy link
Collaborator

@agjohnson agjohnson commented Oct 19, 2019

The main change here is that we load information into the template so
that CSS can make decisions about what element hierarchy it can expect,
instead of covering both html4 and html5 writer with a single set of
rules. I also fixed the tox config so that it generates docs for
testing.

This is also in part going to revert the changes in #785. Instead of
maintaining a list of dl classes to apply the domain styles to, this
PR instead maintains a list of definition list classes to not apply
the domain definition list styling too. There are too many possibilities
to cover with an include list.

Fixes #800
Fixes #801
Fixes #803
Fixes #831
Fixes #802
Fixes #798
Fixes #799
Fixes #741
Fixes #746
Fixes #855

Note for issues that will be closed by this PR

I will be cutting a development release for the theme as soon as this PR is merged. We could use some testing at that point for the release 0.5rc1, which will be available on PyPI (hopefully) early next week.

@agjohnson agjohnson added the PR: work in progress Pull request is not ready for full review label Oct 19, 2019
@agjohnson
Copy link
Collaborator Author

Added a method to also test the badge only css and I found a maybe sphinx 2 related bug. I added a switcher debug link:

image

Copy link
Contributor

@jessetan jessetan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One comment regarding failing tests. Rest is fine to merge.

tox.ini Show resolved Hide resolved
@Blendify Blendify self-requested a review March 26, 2020 02:05
@Blendify
Copy link
Member

@agjohnson can you please update this patch so the tests pass?

@agjohnson
Copy link
Collaborator Author

I am currently finishing up this PR and I will be breaking out some of the unrelated work into separate PRs.

I am resolving the remaining issue with field lists, definition lists, option lists, and footnotes with CSS grid. This is a fairly well supported option and it works more consistently than flex box.

@agjohnson agjohnson force-pushed the agj/fix-dl-styles branch 3 times, most recently from d9ab09a to 34e7656 Compare May 2, 2020 22:12
@agjohnson
Copy link
Collaborator Author

Rebased and should be ready for final review! I've enabled PR builder, though the assets look cached at the moment. PR builds should use the locally available theme for testing, though we should probably be using ?{{ commit }} or something similar to avoid caching the static assets through each build.

Copy link
Member

@ericholscher ericholscher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 excited to get this shipped.

Copy link
Contributor

@davidfischer davidfischer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great!

src/sass/_theme_rst.sass Show resolved Hide resolved
Copy link

@polyzen polyzen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolves #746 and #799 for my simple repos.

@agjohnson agjohnson force-pushed the agj/fix-dl-styles branch from fa363f8 to f4c56d0 Compare May 5, 2020 20:18
@agjohnson
Copy link
Collaborator Author

Thanks for review everyone! I'll move on to cutting a release candidate this afternoon.

@agjohnson agjohnson merged commit a13a7b4 into master May 5, 2020
@agjohnson agjohnson deleted the agj/fix-dl-styles branch May 5, 2020 20:39
whitequark added a commit to amaranth-lang/amaranth that referenced this pull request May 17, 2020
To render correctly, the docs require:
 * pygments/pygments#1441
 * readthedocs/sphinx_rtd_theme#838
gforsyth added a commit to gforsyth/dask-sphinx-theme that referenced this pull request Oct 2, 2020
This fix updates the `layout.html` with changes I grabbed from
readthedocs/sphinx_rtd_theme#838 that relate to the version of the
`htmlwriter` that is used.

This should resolve dask/dask#6696 once a new release of the theme is
cut (I've bumped the version in `__init__.py`) and the update is pulled
in there.
mrocklin pushed a commit to dask/dask-sphinx-theme that referenced this pull request Oct 2, 2020
This fix updates the `layout.html` with changes I grabbed from
readthedocs/sphinx_rtd_theme#838 that relate to the version of the
`htmlwriter` that is used.

This should resolve dask/dask#6696 once a new release of the theme is
cut (I've bumped the version in `__init__.py`) and the update is pulled
in there.

* Switch back to `extends` from rtd theme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment