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

Jump to bottom

Fix pygments #154

Merged
merged 3 commits into from
Apr 7, 2022
Merged

Fix pygments #154

merged 3 commits into from
Apr 7, 2022

Conversation

allcaps
Copy link
Member

@allcaps allcaps commented Apr 7, 2022 •
edited
Loading

Preview of code highlight: https://deploy-preview-154--sphinx-wagtail-theme.netlify.app/examples/rst-page.html

I cherry-picked @vsalvino commit from #125 and added an highlight example.

  • We run our own pygments CSS
  • Newest Sphinx adds pygments (falls back to some default)
  • We don't want that file as those styles take precedence.

Alternative would be to start a specificity war in CSS.

The other PR explains it better. #125

allcaps
allcaps commented Apr 7, 2022
View reviewed changes
Copy link
Member Author

@allcaps allcaps left a comment

Choose a reason for hiding this comment

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

LGTM :)

lb-
lb- approved these changes Apr 7, 2022
View reviewed changes
Copy link
Member

@lb- lb- left a comment

Choose a reason for hiding this comment

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

Thanks. This fix is much better

@allcaps
Copy link
Member Author

allcaps commented Apr 7, 2022

@lb- Thanks for the quick review!
@Stormheg Can make another release? It would be great to get this into Wagtail 2.15.x, 2.16.x and upcoming stable!

@Stormheg
Copy link
Member

Stormheg commented Apr 7, 2022

@allcaps go for it

@lb- lb- mentioned this pull request Apr 7, 2022
Closed
allcaps
allcaps commented Apr 7, 2022
View reviewed changes
Copy link
Member Author

@allcaps allcaps left a comment

Choose a reason for hiding this comment

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

Rebased. All fine.

@allcaps allcaps merged commit b342278 into main Apr 7, 2022
@allcaps allcaps deleted the fix-pygments branch April 7, 2022 21:34
@allcaps allcaps mentioned this pull request Apr 7, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lb- lb- lb- approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@allcaps @Stormheg @lb- @vsalvino