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

docs: match code syntax highlighting from the default theme #3883

Merged
merged 1 commit into from Jul 18, 2018
Merged

docs: match code syntax highlighting from the default theme #3883

merged 1 commit into from Jul 18, 2018

Conversation

htor
Copy link
Contributor

@htor htor commented Jul 16, 2018

syntax highlighting for code in the help/docs is different (but confusingly similar) from the default theme in the editor. for consistency, colors and font weights are adjusted to be the same.

before:

screen shot 2018-07-16 at 19 03 41

after:

screen shot 2018-07-16 at 19 56 02

the careful eye will notice that the editor has slightly lighter tone than the docs.
i wasn't able to translate that from qt into css, but if it's significant i might do it.

the default theme: https://github.com/supercollider/supercollider/blob/develop/editors/sc-ide/core/settings/theme.cpp#L101. testing the docs theme: https://github.com/supercollider/supercollider/blob/develop/HelpSource/syntax_colors.html

@htor htor changed the title match code syntax highlighting from the default theme docs: match code syntax highlighting from the default theme Jul 16, 2018
Copy link
Member

@telephon telephon left a comment

Choose a reason for hiding this comment

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

This was long needed - thanks!

@nhthn nhthn added the comp: SCDoc scdoc syntax, parser, and renderer. for changes to schelp files, use "comp: help" label Jul 17, 2018
@nhthn nhthn added this to the 3.10 milestone Jul 17, 2018
@nhthn nhthn added this to CHERRY PICK THESE in 3.10 Jul 17, 2018
Copy link
Contributor

@patrickdupuis patrickdupuis left a comment

Choose a reason for hiding this comment

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

Thanks! Just a little white space cleanup is needed.

[PR.PR_ATTRIB_NAME, /^\\\w+/],
[PR.PR_ATTRIB_NAME, /^'[^']+'/],
[PR.PR_ATTRIB_NAME, /^\w+\:/],
[PR.PR_ATTRIB_NAME, /^\$(\\)?./],
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you remove the extra white space here?

Copy link
Contributor Author

@htor htor Jul 17, 2018

Choose a reason for hiding this comment

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

yes, done! i force-pushed the change, maybe not the way to do it.

Copy link
Contributor

Choose a reason for hiding this comment

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

You can push a new commit to your remote topic/docs-syntax-hi branch and it will be added to this PR. No force pushing required. We have the option of squashing a PR to keep the commit history clean when merging.

Copy link
Contributor Author

@htor htor Jul 17, 2018

Choose a reason for hiding this comment

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

@patrickdupuis i already did a push -f overwriting this commit with the change, so it can be used for a merge.

@telephon telephon merged commit 19a2fc7 into supercollider:develop Jul 18, 2018
nhthn pushed a commit that referenced this pull request Jul 19, 2018
@nhthn nhthn moved this from CHERRY PICK THESE to Cherry-picked in 3.10 Jul 19, 2018
@htor htor deleted the topic/docs-syntax-hi branch August 21, 2018 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp: SCDoc scdoc syntax, parser, and renderer. for changes to schelp files, use "comp: help"
Projects
No open projects
3.10
Cherry-picked
Development

Successfully merging this pull request may close these issues.

None yet

4 participants