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

Fix extra syntaxes when highlight_theme = "css" #1732

Merged
merged 1 commit into from
Jan 15, 2022

Conversation

jk-ozlabs
Copy link
Contributor

Currently, init_extra_syntaxtes_and_highlight_themes will supress
loading anything if highlight_theme is "css". This makes sense for the
highlight themes, but will also skip loading any extra syntax
definitions too.

This change defers the theme = css check, so we still load syntaxes in
this case.

Fixes: #1723

Signed-off-by: Jeremy Kerr jk@codeconstruct.com.au

Sanity check:

  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Code changes

  • Are you doing the PR on the next branch?

If the change is a new feature or adding to/changing an existing one:

  • Have you created/updated the relevant documentation page(s)?

Currently, init_extra_syntaxtes_and_highlight_themes will supress
loading anything if highlight_theme is "css". This makes sense for the
highlight themes, but will also skip loading any extra syntax
definitions too.

This change defers the theme = css check, so we still load syntaxes in
this case.

Fixes: getzola#1723

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
@jk-ozlabs
Copy link
Contributor Author

We may still want to suppress the highlight theme load with highlight_theme = "css" - let me know if there's a better approach here.

@Keats
Copy link
Collaborator

Keats commented Jan 13, 2022

I think this is fine as is. It would be nice to have a test for it but I can't remember if that's easy to set up

@Keats Keats merged commit cf296ed into getzola:next Jan 15, 2022
Keats pushed a commit that referenced this pull request Jan 22, 2022
Currently, init_extra_syntaxtes_and_highlight_themes will supress
loading anything if highlight_theme is "css". This makes sense for the
highlight themes, but will also skip loading any extra syntax
definitions too.

This change defers the theme = css check, so we still load syntaxes in
this case.

Fixes: #1723

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Keats pushed a commit that referenced this pull request Jan 23, 2022
Currently, init_extra_syntaxtes_and_highlight_themes will supress
loading anything if highlight_theme is "css". This makes sense for the
highlight themes, but will also skip loading any extra syntax
definitions too.

This change defers the theme = css check, so we still load syntaxes in
this case.

Fixes: #1723

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
thomasantony pushed a commit to thomasantony/zola that referenced this pull request Sep 17, 2022
…zola#1732)

Currently, init_extra_syntaxtes_and_highlight_themes will supress
loading anything if highlight_theme is "css". This makes sense for the
highlight themes, but will also skip loading any extra syntax
definitions too.

This change defers the theme = css check, so we still load syntaxes in
this case.

Fixes: getzola#1723

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
@jk-ozlabs jk-ozlabs deleted the syntaxes-fix branch April 13, 2023 04:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants