Update Catppuccin Mocha Blue Theme #75
Merged
+53
−44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tor text, remove border between code block status bar and code
…onts, but adding for future support)
…as custom fonts are not supported; this is either for future support or if you want to use the prismjs theme elsewhere)
|
Your preview URL is: https://theme-builder.notesnook.com/notes?from_pr=streetwriters/notesnook-themes/75 |
|
Resolved merge conflict |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a minor update which:
code-block.cssThe merge conflict is because I initially wrote
code-block.csswith CSS variables, but they weren't working so I created another branch to remove them to see if that fixed it. I've since gotten them working by changing the selector from:roottopre[class*="language-"], but I did this on mymainbranch with the CSS variables. The branch without CSS variables was initially merged.The merge conflict should be resolved by using the
code-block.cssfrom this PR.Edit: have also seen that
theme.jsonis in the conflict, thetheme.jsonfrom this PR should take priority to resolve the conflict.