-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
feat(themes): add mode-specific styles to the tokyonight themes #4415
Merged
the-mikedavis
merged 2 commits into
helix-editor:master
from
usagi-flow:feat-tokyonight-mode-colors
Oct 22, 2022
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,8 @@ | ||
| # Author: Paul Graydon <[email protected]> | ||
|
|
||
| "comment" = { fg = "comment", modifiers = ["italic"] } | ||
| "constant" = { fg = "orange" } | ||
| "constant.character.escape" = { fg = "magenta" } | ||
| "function" = { fg = "blue", modifiers = ["italic"] } | ||
| "function.macro" = { fg = "cyan" } | ||
| "keyword" = { fg = "cyan", modifiers = ["italic"] } | ||
| "keyword.control" = { fg = "magenta" } | ||
| "keyword.control.import" = { fg = "cyan" } | ||
| "keyword.operator" = { fg = "turquoise" } | ||
| "keyword.function" = { fg = "magenta", modifiers = ["italic"] } | ||
| "operator" = { fg = "turquoise" } | ||
| "punctuation" = { fg = "turquoise" } | ||
| "string" = { fg = "light-green" } | ||
| "string.regexp" = { fg = "light-blue" } | ||
| "tag" = { fg = "red" } | ||
| "type" = { fg = "teal" } | ||
| "namespace" = { fg = "blue" } | ||
| "variable" = { fg = "white" } | ||
| "variable.builtin" = { fg = "red" } | ||
| "variable.other.member" = { fg = "green" } | ||
| "variable.parameter" = { fg = "yellow", modifiers = ["italic"] } | ||
|
|
||
| "diff.plus" = { fg = "green" } | ||
| "diff.delta" = { fg = "orange" } | ||
| "diff.minus" = { fg = "red" } | ||
|
|
||
| "ui.background" = { fg = "foreground", bg = "background" } | ||
| "ui.cursor" = { modifiers = ["reversed"] } | ||
| "ui.cursor.match" = { fg = "orange", modifiers = ["bold"] } | ||
| "ui.cursor.primary" = { modifiers = ["reversed"] } | ||
| "ui.cursorline.primary" = { bg = "background_menu" } | ||
| "ui.help" = { fg = "foreground", bg = "background_menu" } | ||
| "ui.linenr" = { fg = "foreground_gutter" } | ||
| "ui.linenr.selected" = { fg = "foreground" } | ||
| "ui.menu" = { fg = "foreground", bg = "background_menu" } | ||
| "ui.menu.selected" = { bg = "background_highlight" } | ||
| "ui.popup" = { fg = "foreground", bg = "background_menu" } | ||
| "ui.selection" = { bg = "background_highlight" } | ||
| "ui.selection.primary" = { bg = "background_highlight" } | ||
| "ui.statusline" = { fg = "foreground", bg = "background_menu" } | ||
| "ui.statusline.inactive" = { fg = "foreground_gutter", bg = "background_menu" } | ||
| "ui.text" = { fg = "foreground" } | ||
| "ui.text.focus" = { fg = "cyan" } | ||
| "ui.virtual.ruler" = { bg = "foreground_gutter" } | ||
| "ui.virtual.whitespace" = { fg = "foreground_gutter" } | ||
| "ui.window" = { fg = "black" } | ||
|
|
||
| "error" = { fg = "red" } | ||
| "warning" = { fg = "yellow" } | ||
| "info" = { fg = "blue" } | ||
| "hint" = { fg = "teal" } | ||
| "diagnostic" = { modifiers = ["underlined"] } | ||
| "special" = { fg = "orange" } | ||
|
|
||
| "markup.heading" = { fg = "cyan", modifiers = ["bold"] } | ||
| "markup.list" = { fg = "cyan" } | ||
| "markup.bold" = { fg = "orange", modifiers = ["bold"] } | ||
| "markup.italic" = { fg = "yellow", modifiers = ["italic"] } | ||
| "markup.link.url" = { fg = "green" } | ||
| "markup.link.text" = { fg = "light-gray" } | ||
| "markup.quote" = { fg = "yellow", modifiers = ["italic"] } | ||
| "markup.raw" = { fg = "cyan" } | ||
| inherits = "tokyonight" | ||
|
|
||
| [palette] | ||
| red = "#f7768e" | ||
| orange = "#ff9e64" | ||
| yellow = "#e0af68" | ||
| light-green = "#9ece6a" | ||
| green = "#73daca" | ||
| turquoise = "#89ddff" | ||
| light-cyan = "#b4f9f8" | ||
| teal = "#2ac3de" | ||
| cyan = "#7dcfff" | ||
| blue = "#7aa2f7" | ||
| magenta = "#bb9af7" | ||
| white = "#c0caf5" | ||
| light-gray = "#9aa5ce" | ||
| parameters = "#cfc9c2" | ||
| comment = "#565f89" | ||
| black = "#414868" | ||
| foreground = "#a9b1d6" | ||
| foreground_highlight = "#c0caf5" | ||
| foreground_gutter = "#3b4261" | ||
| background = "#24283b" | ||
| background_highlight = "#373d5a" | ||
| background_menu = "#1f2335" |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of 'dark' for the color, I think background_gutter makes more sense.
This is a very weak opinion tho, as it doesn't really change anything in how it looks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm,
background_gutteris too light:But I see you had
background_menuin your PR, could that be the color you meant?That said, the reason I initially went with
blackwas because, if we ever create a light theme version of tokyonight (such as here: https://github.com/folke/tokyonight.nvim#day), it would be important that the foreground color remains black/dark, regardless of the gutter/menu background colors (which would most definitely become light).What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a decent enough reason. Because i haven't thought about it, i just had it consistent with the inactive one.
Otherwise, if that one doesn't look good, i am fine with the changes. :) Good job! :)