Skip to content

Commit

Permalink
Change built-in themes to use curly underlines (helix-editor#5419)
Browse files Browse the repository at this point in the history
* Change built-in themes to use curly underlines

* Change fleet_dark to use curly underlines
  • Loading branch information
blt-r authored and Shafkath Shuhan committed Jan 24, 2023
1 parent b43a956 commit c4817e2
Show file tree
Hide file tree
Showing 53 changed files with 237 additions and 81 deletions.
8 changes: 4 additions & 4 deletions runtime/themes/ayu_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"error" = { fg = "red", modifiers = ["bold"] }
"info" = { fg = "blue", modifiers = ["bold"] }
"hint" = { fg = "blue", modifiers = ["bold"] }
"diagnostic"= { fg = "red", modifiers = ["underlined"] }
"diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
"diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
"diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
"diagnostic.hint" = { underline = { color = "blue", style="curl"} }
"diagnostic.info"= { underline = { color = "blue", style="curl"} }
"diagnostic.warning"= { underline = { color = "yellow", style="curl"} }
"diagnostic.error"= { underline = { color = "red", style="curl"} }
"ui.bufferline" = { fg = "gray", bg = "background" }
"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }

Expand Down
8 changes: 4 additions & 4 deletions runtime/themes/ayu_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"error" = { fg = "red", modifiers = ["bold"] }
"info" = { fg = "blue", modifiers = ["bold"] }
"hint" = { fg = "blue", modifiers = ["bold"] }
"diagnostic"= { fg = "red", modifiers = ["underlined"] }
"diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
"diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
"diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
"diagnostic.hint"= { underline = { color = "blue", style = "curl" } }
"diagnostic.info"= { underline = { color = "blue", style = "curl" } }
"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
"diagnostic.error"= { underline = { color = "red", style = "curl" } }
"ui.bufferline" = { fg = "gray", bg = "background" }
"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }

Expand Down
8 changes: 4 additions & 4 deletions runtime/themes/ayu_mirage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"error" = { fg = "red", modifiers = ["bold"] }
"info" = { fg = "blue", modifiers = ["bold"] }
"hint" = { fg = "blue", modifiers = ["bold"] }
"diagnostic"= { fg = "red", modifiers = ["underlined"] }
"diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
"diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
"diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
"diagnostic.hint"= { underline = { color = "blue", style = "curl" } }
"diagnostic.info"= { underline = { color = "blue", style = "curl" } }
"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
"diagnostic.error"= { underline = { color = "red", style = "curl" } }
"ui.bufferline" = { fg = "gray", bg = "background" }
"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }

Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/bogster.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@
"hint" = "bogster-blue"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "bogster-orange", style = "curl"} }
"diagnostic.error" = { underline = { color = "bogster-lred", style = "curl"} }
"diagnostic.info" = { underline = { color = "bogster-teal", style = "curl"} }
"diagnostic.hint" = { underline = { color = "bogster-blue", style = "curl"} }

[palette]
bogster-yellow = "#dcb659"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/bogster_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@
"hint" = "bogster-blue"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "bogster-orange", style = "curl"} }
"diagnostic.error" = { underline = { color = "bogster-lred", style = "curl"} }
"diagnostic.info" = { underline = { color = "bogster-teal", style = "curl"} }
"diagnostic.hint" = { underline = { color = "bogster-blue", style = "curl"} }

[palette]
bogster-orange = "#dc7759"
Expand Down
6 changes: 5 additions & 1 deletion runtime/themes/boo_berry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@
"warning" = { fg = "gold" }
"info" = { fg = "lilac" }
"hint" = { fg = "lilac" }
"diagnostic" = { modifiers = ["underlined"] }

"diagnostic.warning" = { underline = { color = "bubblegum", style = "curl"} }
"diagnostic.error" = { underline = { color = "gold", style = "curl"} }
"diagnostic.info" = { underline = { color = "lilac", style = "curl"} }
"diagnostic.hint" = { underline = { color = "lilac", style = "curl"} }

[palette]
berry = "#3A2A4D"
Expand Down
6 changes: 5 additions & 1 deletion runtime/themes/darcula.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@
"diff.delta" = "grey"
"diff.minus" = "red"

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange", style = "curl"} }
"diagnostic.error" = { underline = { color = "red", style = "curl"} }
"diagnostic.info" = { underline = { color = "grey05", style = "curl"} }
"diagnostic.hint" = { underline = { color = "grey05", style = "curl"} }

"info" = "grey05"
"hint" = "grey05"
"debug" = "grey05"
Expand Down
8 changes: 4 additions & 4 deletions runtime/themes/doom_acario_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
'info' = { fg = 'blue', modifiers = ['bold'] }
'hint' = { fg = 'blue', modifiers = ['bold'] }

'diagnostic'= { fg = 'red', modifiers = ['underlined'] }
'diagnostic.error'= { fg = 'red', modifiers = ['underlined'] }
'diagnostic.info'= { fg = 'blue', modifiers = ['underlined'] }
'diagnostic.warning'= { fg = 'yellow', modifiers = ['underlined'] }
'diagnostic.hint'= { underline = { color = 'red', style = "curl"} }
'diagnostic.error'= { underline = { color = 'red', style = "curl"} }
'diagnostic.info'= { underline = { color = 'blue', style = "curl"} }
'diagnostic.warning'= { underline = { color = 'yellow', style = "curl"} }

'special' = { fg = 'orange' }

Expand Down
10 changes: 7 additions & 3 deletions runtime/themes/emacs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

"ui.background" = { fg = "black", bg = "white" }
"ui.background.separator" = { fg = "black", bg = "white" }
"ui.cursor" = { fg = "white", bg = "gray70" }
"ui.cursor" = { fg = "white", bg = "gray70" }
"ui.cursor.primary" = { fg = "white", bg = "black" }
"ui.cursor.match" = { fg = "black", bg = "turquoise" }
"ui.cursor.select" = { fg = "white", bg = "black" }
Expand All @@ -68,7 +68,7 @@
"ui.selection" = { bg = "lightgoldenrod1" }
"ui.selection.primary" = { bg = "lightgoldenrod2" }
"ui.virtual.whitespace" = "highlight"
"ui.virtual.ruler" = { bg ="gray95" }
"ui.virtual.ruler" = { bg = "gray95" }
"ui.cursorline.primary" = { bg = "darkseagreen2" }
"ui.cursorline.secondary" = { bg = "darkseagreen2" }

Expand All @@ -80,7 +80,11 @@
"warning" = { fg = "dark_orange" }
"info" = { fg = "forest_green" }
"hint" = { fg = "dark_cyan" }
"diagnostic" = { modifiers = ["underlined"] }

"diagnostic.error" = { underline = { color = "red1", style = "curl" } }
"diagnostic.warning" = { underline = { color = "dark_orange", style = "curl" } }
"diagnostic.info" = { underline = { color = "forest_green", style = "curl" } }
"diagnostic.hint" = { underline = { color = "dark_cyan", style = "curl" } }

[palette]
black = "#000000"
Expand Down
7 changes: 6 additions & 1 deletion runtime/themes/everforest_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@
"info" = "aqua"
"warning" = "yellow"
"error" = "red"
"diagnostic" = { modifiers = ["underlined"] }

"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }


[palette]

Expand Down
6 changes: 5 additions & 1 deletion runtime/themes/everforest_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@
"info" = "aqua"
"warning" = "yellow"
"error" = "red"
"diagnostic" = { modifiers = ["underlined"] }

"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }

[palette]

Expand Down
5 changes: 5 additions & 0 deletions runtime/themes/flatwhite.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"variable.parameter" = { fg = "blue_text", bg = "blue_bg" }

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

"diagnostic.info" = { underline = { color = "orange_text", style = "curl" } }
"diagnostic.warning" = { underline = { color = "orange_text", style = "curl" } }
"diagnostic.error" = { underline = { color = "diff_delete", style = "curl" } }

"info" = { fg = "orange_text", bg = "orange_bg" }
"hint" = { modifiers = ["bold"] }
"warning" = { fg = "orange_text", bg = "orange_bg" }
Expand Down
8 changes: 4 additions & 4 deletions runtime/themes/fleet_dark.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@
"warning" = "orange_accent"
"error" = "red_error"
"diagnostic" = { modifiers = [] }
"diagnostic.hint" = { underline = { color = "light", style = "line" } }
"diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
"diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
"diagnostic.error" = { underline = { color = "red_error", style = "line" } }
"diagnostic.hint" = { underline = { color = "light", style = "curl" } }
"diagnostic.info" = { underline = { color = "blue_accent", style = "curl" } }
"diagnostic.warning" = { underline = { color = "yellow_accent", style = "curl" } }
"diagnostic.error" = { underline = { color = "red_error", style = "curl" } }

[palette]
background = "#181818"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/gruvbox.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@
"ui.virtual.whitespace" = "bg2"
"ui.virtual.ruler" = { bg = "bg1" }

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }
"diagnostic.error" = { underline = { color = "red1", style = "curl" } }
"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } }
"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } }

"markup.heading" = "aqua1"
"markup.bold" = { modifiers = ["bold"] }
Expand Down
7 changes: 3 additions & 4 deletions runtime/themes/gruvbox_dark_hard.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"function.macro" = "aqua1"
"function.builtin" = "yellow1"
"tag" = "red1"
"comment" = { fg = "gray1", modifiers = ["italic"] }
"comment" = { fg = "gray1", modifiers = ["italic"] }
"constant" = { fg = "purple1" }
"constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
"string" = "green1"
Expand All @@ -39,7 +39,6 @@
"info" = { fg = "aqua1", bg = "bg1" }
"hint" = { fg = "blue1", bg = "bg1" }

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.error" = { underline = { style = "curl", color = "red0" } }
"diagnostic.warning" = { underline = { style = "curl", color = "orange1" } }
"diagnostic.info" = { underline = { style = "curl", color = "aqua1" } }
Expand Down Expand Up @@ -91,8 +90,8 @@ fg4 = "#a89984" # gray0
gray0 = "#a89984"
gray1 = "#928374"

red0 = "#cc241d" # neutral
red1 = "#fb4934" # bright
red0 = "#cc241d" # neutral
red1 = "#fb4934" # bright
green0 = "#98971a"
green1 = "#b8bb26"
yellow0 = "#d79921"
Expand Down
7 changes: 5 additions & 2 deletions runtime/themes/gruvbox_light.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"function.macro" = "aqua1"
"function.builtin" = "yellow1"
"tag" = "red1"
"comment" = { fg = "gray1", modifiers = ["italic"] }
"comment" = { fg = "gray1", modifiers = ["italic"] }
"constant" = { fg = "purple1" }
"constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
"string" = "green1"
Expand Down Expand Up @@ -62,7 +62,10 @@
"ui.virtual.whitespace" = "bg2"
"ui.virtual.ruler" = { bg = "bg1" }

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }
"diagnostic.error" = { underline = { color = "red1", style = "curl" } }
"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } }
"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } }

"markup.heading" = "aqua1"
"markup.bold" = { modifiers = ["bold"] }
Expand Down
8 changes: 4 additions & 4 deletions runtime/themes/heisenberg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
"error" = { fg = "chili_powder_red", modifiers = ["bold"] }
"info" = { fg = "crystal_blue", modifiers = ["bold"] }
"hint" = { fg = "crystal_blue", modifiers = ["bold"] }
"diagnostic"= { fg = "chili_powder_red", modifiers = ["underlined"] }
"diagnostic.info"= { fg = "crystal_blue", modifiers = ["underlined"] }
"diagnostic.warning"= { fg = "vapor_yellow", modifiers = ["underlined"] }
"diagnostic.error"= { fg = "chili_powder_red", modifiers = ["underlined"] }
"diagnostic.hint" = { underline = {color = "chili_powder_red", style = "curl" } }
"diagnostic.info" = { underline = {color = "crystal_blue", style = "curl" } }
"diagnostic.warning" = { underline = {color = "vapor_yellow", style = "curl" } }
"diagnostic.error" = { underline = {color = "chili_powder_red", style = "curl" } }
"ui.bufferline" = { fg = "gray", bg = "background" }
"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }

Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/hex_lavender.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ inherits = "hex_steel"
[palette]
t1 = "#0e0e0d"
t2 = "#121311"
t3 = "#2b3444" #
t3 = "#2b3444"
t4 = "#61586f"
t5 = "#686e73"
t6 = "#878480"
Expand Down
6 changes: 5 additions & 1 deletion runtime/themes/hex_steel.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@
"ui.virtual.indent-guide" = { fg = "t3" }
"ui.virtual.whitespace" = { fg = "t3" }

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.error" = { underline = { color = "error", style = "curl" } }
"diagnostic.warning" = { underline = { color = "warning", style = "curl" } }
"diagnostic.info" = { underline = { color = "info", style = "curl" } }
"diagnostic.hint" = { underline = { color = "display", style = "curl" } }

"error" = { fg = "error", modifiers = ["bold"] }
"warning" = { fg = "warning", modifiers = ["bold"] }
"info" = { fg = "info", modifiers = ["bold"] }
Expand Down
5 changes: 5 additions & 0 deletions runtime/themes/ingrid.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,8 @@
"error" = "#D74E50"
"info" = "#839A53"
"hint" = "#A6B6CE"

"diagnostic.warning" = { underline = { color = "#D4A520", style = "curl" } }
"diagnostic.error" = { underline = { color = "#D74E50", style = "curl" } }
"diagnostic.info" = { underline = { color = "#839A53", style = "curl" } }
"diagnostic.hint" = { underline = { color = "#A6B6CE", style = "curl" } }
5 changes: 4 additions & 1 deletion runtime/themes/kanagawa.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@

"ui.cursorline.primary" = { bg = "sumiInk3"}

diagnostic = { modifiers = ["underlined"] }
"diagnostic.error" = { underline = { color = "samuraiRed", style = "curl" } }
"diagnostic.warning" = { underline = { color = "roninYellow", style = "curl" } }
"diagnostic.info" = { underline = { color = "waveAqua1", style = "curl" } }
"diagnostic.hint" = { underline = { color = "dragonBlue", style = "curl" } }

error = "samuraiRed"
warning = "roninYellow"
Expand Down
6 changes: 5 additions & 1 deletion runtime/themes/meliora.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@
"ui.virtual.indent-guide" = { fg = "dark_grey2" }
"ui.virtual.whitespace" = { fg = "grey" }

"diagnostic" = { modifiers = ["underlined"] }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }
"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
"diagnostic.hint" = { underline = { color = "magenta", style = "curl" } }

"error" = { fg = "red" }
"warning" = { fg = "orange" }
"info" = { fg = "blue" }
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/mellow.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@
"ui.menu.selected" = { fg = "bright_white", bg = "gray03" }
"ui.menu.scroll" = { fg = "gray04", bg = "gray01" }

diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "bright_yellow", style = "curl" } }
"diagnostic.error" = { underline = { color = "bright_red", style = "curl" } }
"diagnostic.info" = { underline = { color = "bright_blue", style = "curl" } }
"diagnostic.hint" = { underline = { color = "bright_cyan", style = "curl" } }

warning = "bright_yellow"
error = "bright_red"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/monokai.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@
"info" = { fg = "#75beff" }
"hint" = { fg = "#eeeeeb3" }

diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "#cca700", style = "curl" } }
"diagnostic.error" = { underline = { color = "#f48771", style = "curl" } }
"diagnostic.info" = { underline = { color = "#75beff", style = "curl" } }
"diagnostic.hint" = { underline = { color = "#eeeeeb3", style = "curl" } }

[palette]
type = "#A6E22E"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/monokai_pro.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@
"diff.minus" = "red"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }
"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }

# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
"markup.heading" = "green"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/monokai_pro_machine.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@
"diff.minus" = "red"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }
"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }

# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
"markup.heading" = "green"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/monokai_pro_octagon.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@
"diff.minus" = "red"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }
"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }

# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
"markup.heading" = "green"
Expand Down
5 changes: 4 additions & 1 deletion runtime/themes/monokai_pro_ristretto.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@
"diff.minus" = "red"

# make diagnostic underlined, to distinguish with selection text.
diagnostic = { modifiers = ["underlined"] }
"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
"diagnostic.error" = { underline = { color = "red", style = "curl" } }
"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }

# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
"markup.heading" = "green"
Expand Down
Loading

0 comments on commit c4817e2

Please sign in to comment.