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

update(theme): adjust base16_transparent and dark_high_contrast #5105

Merged
merged 5 commits into from
Dec 11, 2022
Merged

update(theme): adjust base16_transparent and dark_high_contrast #5105

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49a6d83
update: use `underline` instead of modifier
GreasySlug Dec 10, 2022
f9a3d85
clean: color adjust and add base theme author sign
GreasySlug Dec 10, 2022
50a9f7d
fix: change dot to dotted
GreasySlug Dec 11, 2022
1cbcc5e
fix: update `underline` instead of modifier
GreasySlug Dec 11, 2022
7fe6e58
clean: adjust colors
GreasySlug Dec 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions runtime/themes/base16_transparent.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
# Author: GreasySlug <9619abgoni@gmail.com>
# This theme is base on base16_theme(Author: NNB <nnbnh@protonmail.com>)

"ui.background" = { fg = "white"}
"ui.background.separator" = { fg = "gray" }
"ui.menu" = { fg = "gray" }
"ui.menu" = { fg = "white" }
"ui.menu.selected" = { modifiers = ["reversed"] }
"ui.menu.scroll" = { fg = "light-gray" }
"ui.linenr" = { fg = "light-gray" }
"ui.linenr.selected" = { fg = "white", modifiers = ["bold"] }
"ui.popup" = { fg = "white" }
"ui.window" = { fg = "white" }
"ui.selection" = { modifiers = [ "reversed"] }
"comment" = { fg = "gray", modifiers = ["italic"] }
"ui.selection" = { bg = "gray" }
"comment" = "light-gray"
"ui.statusline" = { fg = "white" }
"ui.statusline.inactive" = { fg = "gray" }
"ui.statusline.normal" = { fg = "blue", modifiers = ["reversed"] }
"ui.statusline.insert" = { fg = "green", modifiers = ["reversed"] }
"ui.statusline.select" = { fg = "magenta", modifiers = ["reversed"] }
"ui.statusline.normal" = { fg = "black", bg = "blue" }
"ui.statusline.insert" = { fg = "black", bg = "green" }
"ui.statusline.select" = { fg = "black", bg = "magenta" }
"ui.help" = { fg = "light-gray" }
"ui.cursor" = { modifiers = ["reversed"] }
"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
"ui.cursor.match" = { fg = "light-yellow", underline = { color = "light-yellow", style = "line" } }
"ui.cursor.primary" = { modifiers = ["reversed", "slow_blink"] }
"ui.cursor.secondary" = { modifiers = ["reversed"] }
"ui.virtual.ruler" = { fg = "gray", modifiers = ["reversed"] }
"ui.virtual.ruler" = { bg = "gray" }
"ui.virtual.whitespace" = "gray"
"ui.virtual.indent-guide" = "gray"

Expand All @@ -44,7 +45,7 @@
"markup.list" = "light-red"
"markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.url" = { fg = "yellow", underline = { color = "yellow", style = "line"} }
"markup.link.text" = "light-red"
"markup.quote" = "light-cyan"
"markup.raw" = "green"
Expand All @@ -53,19 +54,19 @@
"markup.select" = { fg = "magenta" }

"diff.plus" = "light-green"
"diff.delta" = "yellow"
"diff.delta" = "light-blue"
"diff.delta.moved" = "blue"
"diff.minus" = "light-red"

"ui.gutter" = "gray"
"info" = "light-blue"
"hint" = "gray"
"debug" = "gray"
"warning" = "yellow"
"error" = "light-red"
"ui.gutter" = "gray"
"info" = "light-blue"
"hint" = "light-gray"
"debug" = "light-gray"
"warning" = "light-yellow"
"error" = "light-red"

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.info" = { fg = "light-blue", modifiers = ["underlined"] }
"diagnostic.hint" = { fg = "gray", modifiers = ["underlined"] }
"diagnostic.debug" ={ fg ="gray", modifiers = ["underlined"] }
"diagnostic.warning" = { fg = "yellow", modifiers = ["underlined"] }
"diagnostic.error" = { fg ="light-red", modifiers = ["underlined"] }
"diagnostic.info" = { underline = { color = "light-blue", style = "dot" } }
Copy link
Member

Choose a reason for hiding this comment

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

I think the documentation is currently incorrect about this underline style, it should be dotted:

helix/helix-view/src/graphics.rs

Line 323 in f323ffa

"dotted" => Ok(Self::Dotted),

Copy link
Member

Choose a reason for hiding this comment

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

Yeah I think I mixed that up 😅 I think the documentation was what I originally planning. We use curl and line so using the passive dotted and dashed seemed inconsistent. Perhaps this should be changed to dashes and dots in both documentation and implementation?

Copy link
Member

Choose a reason for hiding this comment

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

I think they're ok as passive - it makes sense to me as "dotted line" or "dashed line". When in doubt I would say we should follow whatever kitty says they are but it looks like then we would need to change to "curly" too for consistency: https://sw.kovidgoyal.net/kitty/underlines/

I think that just updating the documentation to say "dotted" would be the best choice to minimize breaking changes

"diagnostic.hint" = { underline = { color = "light-gray", style = "double_line" } }
"diagnostic.debug" = { underline ={ color ="light-gray", style = "dashed" } }
"diagnostic.warning" = { underline = { color = "light-yellow", style = "curl" } }
"diagnostic.error" = { underline = { color ="light-red", style = "curl" } }