Skip to content

Commit

Permalink
Themes update (helix-editor#3587)
Browse files Browse the repository at this point in the history
* lint: snazzy

* lint: pop-dark

* lint: penumbra+

* lint: noctis_bordo

* lint: ingrid

* lint: flatwhite

* lint: doom_acario_dark

* lint: dark_plus

* lint: boo_berry

* fix: use 47345E per author instruction

* lint: bogster

* lint: everforest

* lint: acme

* lint: serika

* fix: use nasty_red per author suggestion

* lint: nord

* lint: dracula

* lint: gruvbox

* fix: cursorline gruvbox

* lint: autumn

* fix: no fg for cursorline

* lint: ayu

* lint: rose_pine

* lint: monokai

* lint: solarized

* lint: spacebones

* fix: penumbra bg!=sky

* Update runtime/themes/ayu_light.toml

Co-authored-by: Ivan Tham <[email protected]>

* Update runtime/themes/ayu_light.toml

Co-authored-by: Ivan Tham <[email protected]>

* fix: fg for ui.help thanks @pickfire

* fix: ingrid with input from @intarga

Co-authored-by: Ivan Tham <[email protected]>
  • Loading branch information
2 people authored and Shekhinah Memmel committed Dec 11, 2022
1 parent b246294 commit b7539a6
Show file tree
Hide file tree
Showing 39 changed files with 118 additions and 53 deletions.
10 changes: 8 additions & 2 deletions runtime/themes/acme.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@
"ui.background" = {bg="acme_bg"}
"ui.text" = "black"
"ui.selection" = {bg="selected"}
"ui.statusline" = {bg="acme_bar_bg"}
"ui.statusline.inactive" = {bg="acme_bar_inactive"}
"ui.cursorline" = {bg="acme_bar_bg"}
"ui.statusline" = {fg="black", bg="acme_bar_bg"}
"ui.statusline.inactive" = {fg="black", bg="acme_bar_inactive"}
"ui.virtual" = "indent"
"ui.virtual.ruler" = { bg = "acme_bar_bg" }
"ui.cursor.match" = {bg="acme_bar_bg"}
"ui.cursor" = {bg="cursor", fg="white"}
"string" = "red"
"comment" = "green"
"ui.help" = {fg="black", bg="acme_bg"}
"ui.popup" = {fg="black", bg="acme_bg"}
"ui.menu" = {fg="black", bg="acme_bg"}
"ui.menu.selected" = {bg="selected"}
"ui.window" = {bg="acme_bg"}
"diagnostic.error" = {bg="white", modifiers=["bold"]}
"diagnostic.warning" = {bg="white", modifiers=["bold"]}
"diagnostic.hint" = {bg="white", modifiers=["bold"]}
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/autumn.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray1"}
"ui.selection" = { bg = "my_gray3" }
"comment" = { fg = "my_gray4", modifiers = ["italic"] }
"ui.cursorline" = { bg = "my_gray2" }
"ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
"ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
"ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/autumn_night.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray1"}
"ui.selection" = { bg = "my_gray3" }
"comment" = { fg = "my_gray4", modifiers = ["italic"] }
"ui.cursorline" = { bg = "my_gray2" }
"ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
"ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
"ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
Expand Down
9 changes: 5 additions & 4 deletions runtime/themes/ayu_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@
"ui.cursor.match" = { fg = "orange" }
"ui.linenr" = { fg = "dark_gray" }
"ui.linenr.selected" = { fg = "orange" }
"ui.statusline" = { bg = "black" }
"ui.popup" = { bg = "black" }
"ui.statusline" = { fg = "foreground", bg = "black" }
"ui.cursorline" = { bg = "black" }
"ui.popup" = { fg = "#7B91b3", bg = "black" }
"ui.window" = { fg = "dark_gray" }
"ui.help" = { bg = "black" }
"ui.help" = { fg = "#7B91b3", bg = "black" }
"ui.text" = { fg = "foreground" }
"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
"ui.text.info" = { fg = "foreground" }
"ui.virtual.whitespace" = { fg = "dark_gray" }
"ui.virtual.ruler" = { bg = "black" }
"ui.menu" = { bg = "black" }
"ui.menu" = { fg = "foreground", bg = "black" }
"ui.menu.selected" = { bg = "orange", fg = "background" }
"ui.selection" = { bg = "dark_gray" }
"warning" = { fg = "yellow" }
Expand Down
7 changes: 4 additions & 3 deletions runtime/themes/ayu_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@
"ui.cursor.match" = { fg = "orange" }
"ui.linenr" = { fg = "dark_gray" }
"ui.linenr.selected" = { fg = "orange" }
"ui.statusline" = { bg = "black" }
"ui.cursorline" = { bg = "black" }
"ui.statusline" = { fg = "foreground", bg = "black" }
"ui.popup" = { bg = "black" }
"ui.window" = { fg = "dark_gray" }
"ui.help" = { bg = "black" }
"ui.help" = { fg = "foreground", bg = "black" }
"ui.text" = { fg = "foreground" }
"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
"ui.text.info" = { fg = "foreground" }
"ui.virtual.whitespace" = { fg = "dark_gray" }
"ui.virtual.ruler" = { bg = "black" }
"ui.menu" = { bg = "black" }
"ui.menu" = { fg = "foreground", bg = "black" }
"ui.menu.selected" = { bg = "orange", fg = "background" }
"ui.selection" = { bg = "dark_gray" }
"warning" = { fg = "yellow" }
Expand Down
7 changes: 4 additions & 3 deletions runtime/themes/ayu_mirage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@
"ui.cursor.match" = { fg = "orange" }
"ui.linenr" = { fg = "dark_gray" }
"ui.linenr.selected" = { fg = "orange" }
"ui.statusline" = { bg = "black" }
"ui.cursorline" = { bg = "black" }
"ui.statusline" = { fg = "foreground", bg = "black" }
"ui.popup" = { bg = "black" }
"ui.window" = { fg = "dark_gray" }
"ui.help" = { bg = "black" }
"ui.help" = { fg = "foreground", bg = "black" }
"ui.text" = { fg = "foreground" }
"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
"ui.text.info" = { fg = "foreground" }
"ui.virtual.whitespace" = { fg = "dark_gray" }
"ui.virtual.ruler" = { bg = "black" }
"ui.menu" = { bg = "black" }
"ui.menu" = { fg = "foreground", bg = "black" }
"ui.menu.selected" = { bg = "orange", fg = "background" }
"ui.selection" = { bg = "dark_gray" }
"warning" = { fg = "yellow" }
Expand Down
2 changes: 2 additions & 0 deletions runtime/themes/bogster.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"ui.background" = { bg = "#161c23" }
"ui.linenr" = { fg = "#415367" }
"ui.linenr.selected" = { fg = "#e5ded6" } # TODO
"ui.cursorline" = { bg = "#131920" }
"ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
"ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
"ui.popup" = { bg = "#232d38" }
Expand All @@ -54,6 +55,7 @@
"ui.text" = { fg = "#e5ded6" }
"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
"ui.virtual.whitespace" = "#627d9d"
"ui.virtual.ruler" = { bg = "#131920" }

"ui.selection" = { bg = "#313f4e" }
# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
Expand Down
4 changes: 3 additions & 1 deletion runtime/themes/boo_berry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"ui.cursor.insert" = { fg = "berry", bg = "mint" }
"ui.linenr" = { fg = "berry_desaturated" }
"ui.linenr.selected" = { fg = "lilac" }
"ui.cursorline" = { fg = "lilac", bg = "berry_dim" }
"ui.statusline" = { fg = "lilac", bg = "berry_saturated" }
"ui.statusline.inactive" = { fg = "berry_desaturated", bg = "berry_saturated" }
"ui.popup" = { fg = "lilac", bg = "berry_saturated" }
Expand All @@ -45,7 +46,7 @@
"ui.menu.selected" = { fg = "mint", bg = "berry_saturated" }
"ui.selection" = { bg = "berry_saturated" }
"ui.virtual.whitespace" = { fg = "berry_desaturated" }
"ui.virtual.ruler" = { bg ="berry_desaturated" }
"ui.virtual.ruler" = { bg ="berry_dim" }

"diff.plus" = { fg = "mint" }
"diff.delta" = { fg = "gold" }
Expand All @@ -65,6 +66,7 @@

[palette]
berry = "#3A2A4D"
berry_dim = "#47345E"
berry_saturated = "#2B1C3D"
berry_desaturated = "#886C9C"
bubblegum = "#D678B5"
Expand Down
6 changes: 3 additions & 3 deletions runtime/themes/dark_plus.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"ui.background" = { fg = "light_gray", bg = "dark_gray2" }

"ui.window" = { bg = "widget" }
"ui.popup" = { bg = "widget" }
"ui.help" = { bg = "widget" }
"ui.menu" = { bg = "widget" }
"ui.popup" = { fg = "text", bg = "widget" }
"ui.help" = { fg = "text", bg = "widget" }
"ui.menu" = { fg = "text", bg = "widget" }
"ui.menu.selected" = { bg = "dark_blue2" }

# TODO: Alternate bg colour for `ui.cursor.match` and `ui.selection`.
Expand Down
6 changes: 3 additions & 3 deletions runtime/themes/doom_acario_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@
'ui.cursorline' = { bg = 'bg-alt' }
'ui.linenr' = { fg = 'base4' }
'ui.linenr.selected' = { fg = 'orange', bg = 'bg-alt', modifiers = ['bold'] }
'ui.statusline' = { bg = 'base3' }
'ui.statusline' = { fg = 'fg', bg = 'base3' }
'ui.statusline.normal' = { bg = 'base3' }
'ui.statusline.insert' = { bg = 'base3' }
'ui.statusline.select' = { bg = 'base3' }
'ui.popup' = { bg = 'bg-alt' }
'ui.window' = { fg = 'gray' }
'ui.help' = { bg = 'base2' }
'ui.help' = { fg = 'fg', bg = 'base2' }
'ui.text' = { fg = 'fg' }
'ui.text.focus' = { bg = 'bg-alt', fg = 'fg' }
'ui.text.info' = { fg = 'fg' }
'ui.virtual.whitespace' = { fg = 'base2' }
'ui.virtual.ruler' = { bg = 'black' }
'ui.menu' = { bg = 'bg-alt' }
'ui.menu' = { fg = 'fg', bg = 'bg-alt' }
'ui.menu.selected' = { bg = 'base3', fg = 'fg' }
'ui.selection' = { bg = 'base2' }

Expand Down
1 change: 1 addition & 0 deletions runtime/themes/dracula.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"ui.text.focus" = { fg = "cyan" }
"ui.window" = { fg = "foreground" }
"ui.virtual.whitespace" = { fg = "comment" }
"ui.virtual.ruler" = { bg = "background_dark"}

"error" = { fg = "red" }
"warning" = { fg = "cyan" }
Expand Down
2 changes: 2 additions & 0 deletions runtime/themes/dracula_at_night.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"ui.popup" = { fg = "foreground", bg = "background_dark" }
"ui.selection" = { fg = "background", bg = "purple", modifiers = ["dim"] }
"ui.selection.primary" = { fg = "background", bg = "pink" }
"ui.cursorline" = { bg = "background_dark" }
"ui.statusline" = { fg = "foreground", bg = "background_dark" }
"ui.statusline.inactive" = { fg = "comment", bg = "background_dark" }
"ui.statusline.normal" = { fg = "background_dark", bg = "cyan" }
Expand All @@ -40,6 +41,7 @@
"ui.text" = { fg = "foreground" }
"ui.text.focus" = { fg = "cyan" }
"ui.window" = { fg = "foreground" }
"ui.virtual.ruler" = { bg = "background_dark" }

"error" = { fg = "red" }
"warning" = { fg = "cyan" }
Expand Down
2 changes: 2 additions & 0 deletions runtime/themes/everforest_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"ui.cursor.select" = { fg = "bg0", bg = "blue" }
"ui.linenr" = "grey0"
"ui.linenr.selected" = "fg"
"ui.cursorline" = { bg = "bg1" }
"ui.statusline" = { fg = "grey2", bg = "bg2" }
"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
"ui.popup" = { fg = "grey2", bg = "bg1" }
Expand All @@ -71,6 +72,7 @@
"ui.menu.selected" = { fg = "bg0", bg = "green" }
"ui.selection" = { bg = "bg3" }
"ui.virtual.whitespace" = "grey0"
"ui.virtual.ruler" = { bg = "bg1" }

"hint" = "blue"
"info" = "aqua"
Expand Down
2 changes: 2 additions & 0 deletions runtime/themes/everforest_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"ui.cursor.select" = { fg = "bg0", bg = "blue" }
"ui.linenr" = "grey0"
"ui.linenr.selected" = "fg"
"ui.cursorline" = { bg = "bg1" }
"ui.statusline" = { fg = "grey2", bg = "bg2" }
"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
"ui.popup" = { fg = "grey2", bg = "bg1" }
Expand All @@ -71,6 +72,7 @@
"ui.menu.selected" = { fg = "bg0", bg = "green" }
"ui.selection" = { bg = "bg3" }
"ui.virtual.whitespace" = "grey0"
"ui.virtual.ruler" = { bg = "bg1" }

"hint" = "blue"
"info" = "aqua"
Expand Down
1 change: 1 addition & 0 deletions runtime/themes/flatwhite.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"ui.linenr.selected" = { bg = "base6", modifiers = ["reversed"] }

"ui.statusline" = { fg = "base7", bg = "base1", modifiers = ["bold"] }
"ui.statusline.inactive" = { fg = "base7", bg = "base3" }
"ui.statusline.normal" = { fg = "base7", bg = "base1", modifiers = ["bold"] }
"ui.statusline.insert" = { fg = "purple_text", bg = "purple_bg", modifiers = [
"bold",
Expand Down
2 changes: 2 additions & 0 deletions runtime/themes/gruvbox.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"ui.background" = { bg = "bg0" }
"ui.linenr" = { fg = "bg4" }
"ui.linenr.selected" = { fg = "yellow1" }
"ui.cursorline" = { bg = "bg1" }
"ui.statusline" = { fg = "fg1", bg = "bg2" }
"ui.statusline.normal" = { fg = "fg1", bg = "bg2" }
"ui.statusline.insert" = { fg = "fg1", bg = "blue0" }
Expand All @@ -57,6 +58,7 @@
"ui.menu" = { fg = "fg1", bg = "bg2" }
"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
"ui.virtual.whitespace" = "bg2"
"ui.virtual.ruler" = { bg = "bg1" }

"diagnostic" = { modifiers = ["underlined"] }

Expand Down
2 changes: 2 additions & 0 deletions runtime/themes/gruvbox_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"ui.background" = { bg = "bg0" }
"ui.linenr" = { fg = "bg4" }
"ui.linenr.selected" = { fg = "yellow1" }
"ui.cursorline" = { bg = "bg1" }
"ui.statusline" = { fg = "fg1", bg = "bg2" }
"ui.statusline.normal" = { fg = "fg1", bg = "bg2" }
"ui.statusline.insert" = { fg = "fg1", bg = "blue0" }
Expand All @@ -58,6 +59,7 @@
"ui.menu" = { fg = "fg1", bg = "bg2" }
"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
"ui.virtual.whitespace" = "bg2"
"ui.virtual.ruler" = { bg = "bg1" }

"diagnostic" = { modifiers = ["underlined"] }

Expand Down
11 changes: 7 additions & 4 deletions runtime/themes/ingrid.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,22 @@

"ui.background" = { bg = "#FFFCFD" }
"ui.linenr" = { fg = "#bbbbbb" }
"ui.linenr.selected" = { fg = "#F3EAE9" } # TODO
"ui.linenr.selected" = { fg = "#ED5466", modifiers = ["bold"] }
"ui.cursorline" = { bg = "#F3EAE9" }
"ui.statusline" = { fg = "#250E07", bg = "#F3EAE9" }
"ui.statusline.inactive" = { fg = "#7b91b3", bg = "#F3EAE9" }
"ui.popup" = { bg = "#F3EAE9" }
"ui.popup" = { fg = "#7B91b3", bg = "#F3E8E9" }
"ui.window" = { bg = "#D8B8B3" }
"ui.help" = { bg = "#D8B8B3", fg = "#250E07" }

"ui.text" = { fg = "#7B91B3" }
"ui.text.focus" = { fg = "#250E07", modifiers= ["bold"] }
"ui.virtual.whitespace" = "#A6B6CE"
"ui.virtual.ruler" = { bg = "#F3EAE9" }

"ui.selection" = { bg = "#540099" }
# "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported
"ui.selection" = { bg = "#F3EAE9" }
"ui.cursor.primary" = { bg = "#ED5466", fg = "#FFFCFD", modifiers = ["bold"] }
"ui.cursor.match" = { bg = "#F3EAE9", fg = "#ED5466", modifiers = ["bold"] }
"ui.menu" = { fg = "#7B91B3", bg = "#F3EAE9" }
"ui.menu.selected" = { fg = "#D74E50", bg = "#F3EAE9" }

Expand Down
8 changes: 5 additions & 3 deletions runtime/themes/monokai.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

"comment" = { fg = "#88846F" }
"ui.virtual.whitespace" = "#88846F"
"ui.virtual.ruler" = { bg = "#24241e" }

"string" = { fg = "#e6db74" }
"constant.character" = { fg = "#e6db74" }
Expand All @@ -57,9 +58,9 @@
"ui.background" = { fg = "text", bg = "background" }

"ui.window" = { bg = "widget" }
"ui.popup" = { bg = "widget" }
"ui.help" = { bg = "widget" }
"ui.menu" = { bg = "widget" }
"ui.popup" = { fg = "text", bg = "widget" }
"ui.help" = { fg = "text", bg = "widget" }
"ui.menu" = { fg = "text", bg = "widget" }
"ui.menu.selected" = { bg = "#414339" }

"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] }
Expand All @@ -72,6 +73,7 @@
"ui.linenr" = { fg = "#90908a" }
"ui.linenr.selected" = { fg = "#c2c2bf" }

"ui.cursorline" = { bg = "#24241e" }
"ui.statusline" = { fg = "active_text", bg = "#414339" }
"ui.statusline.inactive" = { fg = "active_text", bg = "#75715e" }

Expand Down
8 changes: 5 additions & 3 deletions runtime/themes/monokai_pro.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,25 @@
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual.whitespace" = "base5"
"ui.virtual.ruler" = { bg = "base1" }

"info" = "base8"
"hint" = "base8"

# background color
"ui.background" = { bg = "base2" }
"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }

# status bars, panels, modals, autocompletion
"ui.statusline" = { bg = "base4" }
"ui.statusline" = { fg = "base8", bg = "base4" }
"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
"ui.popup" = { bg = "base3" }
"ui.window" = { bg = "base3" }
"ui.help" = { bg = "base3" }
"ui.help" = { fg = "base8", bg = "base3" }

# active line, highlighting
"ui.selection" = { bg = "base4" }
"ui.cursor.match" = { bg = "base4" }
"ui.cursorline" = { bg = "base1" }

# comments, nord3 based lighter color
"comment" = { fg = "base5", modifiers = ["italic"] }
Expand Down
6 changes: 4 additions & 2 deletions runtime/themes/monokai_pro_machine.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"ui.menu" = { fg = "base8", bg = "base3" }
"ui.menu.selected" = { fg = "base2", bg = "yellow" }
"ui.virtual.whitespace" = "base5"
"ui.virtual.ruler" = { bg = "base1" }

"info" = "base8"
"hint" = "base8"
Expand All @@ -16,14 +17,15 @@
"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }

# status bars, panels, modals, autocompletion
"ui.statusline" = { bg = "base4" }
"ui.statusline" = { fg = "base8", bg = "base4" }
"ui.popup" = { bg = "base3" }
"ui.window" = { bg = "base3" }
"ui.help" = { bg = "base3" }
"ui.help" = { fg = "base8", bg = "base3" }

# active line, highlighting
"ui.selection" = { bg = "base4" }
"ui.cursor.match" = { bg = "base4" }
"ui.cursorline" = { bg = "base1" }

# comments, nord3 based lighter color
"comment" = { fg = "base5", modifiers = ["italic"] }
Expand Down
Loading

1 comment on commit b7539a6

@pickfire
Copy link

Choose a reason for hiding this comment

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

Please don't tag me in the commit message, I get unnecessary ping.

Please sign in to comment.