From 9be810fd01f495c795ab5e5b7240a32708d19f5c Mon Sep 17 00:00:00 2001 From: Christoph Horn Date: Fri, 6 May 2022 14:07:22 +0200 Subject: [PATCH] add missing `ui.menu` to themes, fix issues with some themes --- runtime/themes/bogster.toml | 4 +++- runtime/themes/ingrid.toml | 1 + runtime/themes/monokai.toml | 6 ++++-- runtime/themes/monokai_pro.toml | 1 + runtime/themes/monokai_pro_machine.toml | 1 + runtime/themes/monokai_pro_octagon.toml | 1 + runtime/themes/monokai_pro_ristretto.toml | 1 + runtime/themes/monokai_pro_spectrum.toml | 1 + runtime/themes/nord.toml | 1 + runtime/themes/onedark.toml | 1 + runtime/themes/onelight.toml | 3 ++- theme.toml | 2 +- 12 files changed, 18 insertions(+), 5 deletions(-) diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml index af952071b..df3a7f315 100644 --- a/runtime/themes/bogster.toml +++ b/runtime/themes/bogster.toml @@ -59,7 +59,9 @@ # "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported "ui.cursor.match" = { fg = "#313f4e", bg = "#dc7759" } "ui.cursor" = { fg = "#ABB2BF", modifiers = ["reversed"] } -"ui.menu.selected" = { fg = "#e5ded6", bg = "#313f4e" } + +"ui.menu" = { fg = "#e5ded6bg", bg = "#232d38" } +"ui.menu.selected" = { bg = "#313f4e" } "warning" = "#dc7759" "error" = "#dc597f" diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml index da8730cc1..79b749b14 100644 --- a/runtime/themes/ingrid.toml +++ b/runtime/themes/ingrid.toml @@ -57,6 +57,7 @@ "ui.selection" = { bg = "#540099" } # "ui.cursor.match" # TODO might want to override this because dimmed is not widely supported +"ui.menu" = { fg = "#7B91B3", bg = "#F3EAE9" } "ui.menu.selected" = { fg = "#D74E50", bg = "#F3EAE9" } "warning" = "#D4A520" diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml index a71482728..3fb1fadc3 100644 --- a/runtime/themes/monokai.toml +++ b/runtime/themes/monokai.toml @@ -59,7 +59,8 @@ "ui.window" = { bg = "widget" } "ui.popup" = { bg = "widget" } "ui.help" = { bg = "widget" } -"ui.menu.selected" = { bg = "widget" } +"ui.menu" = { bg = "widget" } +"ui.menu.selected" = { bg = "#414339" } "ui.cursor" = { fg = "cursor", modifiers = ["reversed"] } "ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] } @@ -71,7 +72,7 @@ "ui.linenr" = { fg = "#90908a" } "ui.linenr.selected" = { fg = "#c2c2bf" } -"ui.statusline" = { fg = "active_text", bg = "#75715e" } +"ui.statusline" = { fg = "active_text", bg = "#414339" } "ui.statusline.inactive" = { fg = "active_text", bg = "#75715e" } "ui.text" = { fg = "text", bg = "background" } @@ -98,3 +99,4 @@ active_text = "#ffffff" cursor = "#a6a6a6" inactive_cursor = "#878b91" widget = "#1e1f1c" +selection = "#414339" diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml index b28f700cd..5580a33c6 100644 --- a/runtime/themes/monokai_pro.toml +++ b/runtime/themes/monokai_pro.toml @@ -4,6 +4,7 @@ "ui.linenr.selected" = { bg = "base3" } "ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } +"ui.menu" = { fg = "base8", bg = "base3" } "ui.menu.selected" = { fg = "base2", bg = "yellow" } "ui.virtual" = "base5" diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml index 4a2e53e42..abbe5bdca 100644 --- a/runtime/themes/monokai_pro_machine.toml +++ b/runtime/themes/monokai_pro_machine.toml @@ -4,6 +4,7 @@ "ui.linenr.selected" = { bg = "base3" } "ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } +"ui.menu" = { fg = "base8", bg = "base3" } "ui.menu.selected" = { fg = "base2", bg = "yellow" } "ui.virtual" = "base5" diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml index 48709145e..b249cfe21 100644 --- a/runtime/themes/monokai_pro_octagon.toml +++ b/runtime/themes/monokai_pro_octagon.toml @@ -4,6 +4,7 @@ "ui.linenr.selected" = { bg = "base3" } "ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } +"ui.menu" = { fg = "base8", bg = "base3" } "ui.menu.selected" = { fg = "base2", bg = "yellow" } "ui.virtual" = "base5" diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml index f7c370949..cd4cbd8e9 100644 --- a/runtime/themes/monokai_pro_ristretto.toml +++ b/runtime/themes/monokai_pro_ristretto.toml @@ -4,6 +4,7 @@ "ui.linenr.selected" = { bg = "base3" } "ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } +"ui.menu" = { fg = "base8", bg = "base3" } "ui.menu.selected" = { fg = "base2", bg = "yellow" } "ui.virtual" = "base5" diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml index 80e2a88d4..4160a15e1 100644 --- a/runtime/themes/monokai_pro_spectrum.toml +++ b/runtime/themes/monokai_pro_spectrum.toml @@ -4,6 +4,7 @@ "ui.linenr.selected" = { bg = "base3" } "ui.text.focus" = { fg = "yellow", modifiers= ["bold"] } +"ui.menu" = { fg = "base8", bg = "base3" } "ui.menu.selected" = { fg = "base2", bg = "yellow" } "ui.virtual" = "base5" diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml index a6384d1b3..a61c17157 100644 --- a/runtime/themes/nord.toml +++ b/runtime/themes/nord.toml @@ -2,6 +2,7 @@ "ui.linenr.selected" = { fg = "nord4" } "ui.text.focus" = { fg = "nord8", modifiers= ["bold"] } +"ui.menu" = { fg = "nord6", bg = "#232d38" } "ui.menu.selected" = { fg = "nord8", bg = "nord2" } "ui.virtual" = "gray" diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml index 573a635d7..280f6914d 100644 --- a/runtime/themes/onedark.toml +++ b/runtime/themes/onedark.toml @@ -69,6 +69,7 @@ diagnostic = { modifiers = ["underlined"] } "ui.help" = { bg = "gray" } "ui.popup" = { bg = "gray" } "ui.window" = { bg = "gray" } +"ui.menu" = { fg = "white", bg = "gray" } "ui.menu.selected" = { fg = "black", bg = "blue" } [palette] diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml index 3674e821e..c89e20f93 100644 --- a/runtime/themes/onelight.toml +++ b/runtime/themes/onelight.toml @@ -92,9 +92,10 @@ "ui.text" = { fg = "black" } "ui.text.focus" = { fg = "red", bg = "light-white", modifiers = ["bold"] } -"ui.help" = { bg = "light-white" } +"ui.help" = { fg = "black", bg = "light-white" } "ui.popup" = { bg = "light-white" } "ui.window" = { bg = "light-white" } +"ui.menu" = { fg = "black", bg = "light-white" } "ui.menu.selected" = { fg = "white", bg = "light-blue" } [palette] diff --git a/theme.toml b/theme.toml index 55e859c82..a0186e92a 100644 --- a/theme.toml +++ b/theme.toml @@ -64,7 +64,7 @@ label = "honey" "ui.cursor" = { modifiers = ["reversed"] } "ui.highlight" = { bg = "bossanova" } -"ui.menu" = { fg = "lilac", bg = "revolver" } +"ui.menu" = { fg = "lavender", bg = "revolver" } "ui.menu.selected" = { fg = "revolver", bg = "white" } diagnostic = { modifiers = ["underlined"] }