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

feat(themes): add rulers for themes missing them #10309

Merged
merged 13 commits into from
Apr 18, 2024
Merged

feat(themes): add rulers for themes missing them #10309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6096ca2
refactor(themes): removed `ui.highlight` effects from `solarized_light`
RoloEdits Apr 8, 2024
4a2db45
refactor(themes): change `solarized_*` ruler to `bg`
RoloEdits Apr 8, 2024
1cd277f
feat(themes): add `ui.virtual.ruler` for `default`
RoloEdits Apr 8, 2024
80d76a2
fix(themes): correct typo in `theme.toml`
RoloEdits Apr 8, 2024
deca64a
feat(themes): add `ui.virtual.ruler` for `horizon-dark`
RoloEdits Apr 8, 2024
344f48d
feat(themes): add `ui.virtual.ruler` for `base16_default`
RoloEdits Apr 8, 2024
e46b2ed
feat(themes): add `ui.virtual.ruler` for `vim_dark_high_contrast`
RoloEdits Apr 8, 2024
ed92e6b
feat(themes): add `ui.virtual.ruler` for `varua`
RoloEdits Apr 8, 2024
1372726
feat(themes): add `ui.virtual.ruler` for `poimandres`
RoloEdits Apr 8, 2024
58934c3
feat(themes): add `ui.virtual.ruler` for `mellow`
RoloEdits Apr 8, 2024
c6e513b
feat(themes): add `ui.virtual.ruler` for `base16_terminal`
RoloEdits Apr 8, 2024
348f8a0
feat(themes): add `ui.virtual.ruler` for `base16_default_light`
RoloEdits Apr 8, 2024
57b4d9d
feat(themes): add `ui.virtual.ruler` for `base16_default_dark`
RoloEdits Apr 8, 2024
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
1 change: 1 addition & 0 deletions base16_theme.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"namespace" = "magenta"
"ui.help" = { fg = "white", bg = "black" }
"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
"ui.virtual.ruler" = { bg = "black" }

"markup.heading" = "blue"
"markup.list" = "red"
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/base16_default_dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"ui.background" = { bg = "base00" }
"ui.virtual.whitespace" = "base03"
"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
"ui.virtual.ruler" = { bg = "base01" }
"ui.menu" = { fg = "base05", bg = "base01" }
"ui.menu.selected" = { fg = "base01", bg = "base04" }
"ui.linenr" = { fg = "base03", bg = "base01" }
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/base16_default_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
"ui.virtual.whitespace" = "base03"
"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
"ui.virtual.ruler" = { bg = "base01" }
"ui.text" = "base05"
"operator" = "base05"
"ui.text.focus" = "base05"
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/base16_terminal.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
"ui.virtual.whitespace" = "light-gray"
"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
"ui.virtual.ruler" = { bg = "black" }
"variable" = "light-red"
"constant.numeric" = "yellow"
"constant" = "yellow"
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/horizon-dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace = "orange"
"ui.selection" = { bg = "selection" }
"ui.virtual.indent-guide" = { fg = "gray" }
"ui.virtual.whitespace" = { fg = "light-gray" }
"ui.virtual.ruler" = { bg ="dark-bg" }
"ui.statusline" = { bg = "dark-bg", fg = "light-gray" }
"ui.popup" = { bg = "dark-bg", fg = "orange" }
"ui.help" = { bg = "dark-bg", fg = "orange" }
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/mellow.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"ui.text.focus" = { fg = "fg" }

"ui.virtual" = { fg = "gray02" }
"ui.virtual.ruler" = { bg ="gray02" }
"ui.virtual.indent-guide" = { fg = "gray02" }
"ui.virtual.inlay-hint" = { fg = "gray04" }

Expand Down
1 change: 1 addition & 0 deletions runtime/themes/poimandres.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ string = { fg = "brightMint" }
"ui.text.inactive" = "darkerGray"
"ui.virtual" = { fg = "darkerGray.b0" }
"ui.virtual.indent-guide" = "#303442"
"ui.virtual.ruler" = { bg ="selection" }

"ui.selection" = { bg = "focus" }
"ui.selection.primary" = { bg = "selection" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/solarized_dark.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"ui.selection.primary" = { bg = "base015" }

"ui.virtual.indent-guide" = { fg = "base02" }
"ui.virtual.ruler" = { fg = "red" }
"ui.virtual.ruler" = { bg = "base02" }

# normal模式的光标
"ui.cursor" = {fg = "base02", bg = "cyan"}
Expand Down
5 changes: 1 addition & 4 deletions runtime/themes/solarized_light.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@
# 影响 picker列表选中, 快捷键帮助窗口文本
# Affects picker list selection, shortcut key help window text
"ui.text.focus" = { fg = "blue", modifiers = ["bold"]}
# file picker中， 预览的当前选中项
# In file picker, the currently selected item of the preview
"ui.highlight" = { fg = "red", modifiers = ["bold", "italic", "underlined"] }

# 主光标/selection
# main cursor/selection
Expand All @@ -107,7 +104,7 @@
"ui.selection.primary" = { bg = "base015" }

"ui.virtual.indent-guide" = { fg = "base02" }
"ui.virtual.ruler" = { fg = "red" }
"ui.virtual.ruler" = { bg = "base02" }

# normal模式的光标
# normal mode cursor
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/varua.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"ui.statusline.select" = { bg = "blue", fg = "bg2" }
"ui.virtual.wrap" = { fg = "grey0" }
"ui.virtual.inlay-hint" = { fg = "grey1" }
"ui.virtual.ruler" = { bg = "bg2"}

"hint" = "blue"
"info" = "aqua"
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/vim_dark_high_contrast.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"ui.text.focus" = { fg = "yellow" }
"ui.virtual.wrap" = { fg = "dark-blue" }
"ui.virtual.indent-guide" = { fg = "dark-blue" }
"ui.virtual.ruler" = { bg = "dark-white" }
"ui.window" = { bg = "dark-white" }

"diagnostic.error" = { bg = "dark-red" }
Expand Down
3 changes: 2 additions & 1 deletion theme.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ label = "honey"
"diff.minus" = "#f22c86"
"diff.delta" = "#6f44f0"

# TODO: diferentiate doc comment
# TODO: differentiate doc comment
# concat (ERROR) @error.syntax and "MISSING ;" selectors for errors

"ui.background" = { bg = "midnight" }
Expand All @@ -56,6 +56,7 @@ label = "honey"
"ui.text.focus" = { fg = "white" }
"ui.text.inactive" = "sirocco"
"ui.virtual" = { fg = "comet" }
"ui.virtual.ruler" = { bg = "revolver" }
"ui.virtual.jump-label" = { fg = "apricot", modifiers = ["bold"] }

"ui.virtual.indent-guide" = { fg = "comet" }
Expand Down
Loading