From b119252b80fb88686a1981cd8e2570297be9ecbd Mon Sep 17 00:00:00 2001 From: Chirikumbrah <78883260+Chirikumbrah@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:05:01 +0300 Subject: [PATCH] Large Gruvbox refactoring (#10773) * gruvbox refactoring * removed unnecessary lines * set purple1 for operators * changed diagnostics colors * removed some unnecessary lines * set diff.delta color to yellow * removed some tag colors --- runtime/themes/gruvbox.toml | 181 +++++++++++++++++++++--------------- 1 file changed, 108 insertions(+), 73 deletions(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index 67ca066f71f9..220843b50de3 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -1,89 +1,125 @@ # Author : Jakub Bartodziej # The theme uses the gruvbox dark palette with standard contrast: github.com/morhetz/gruvbox -"attribute" = "aqua1" -"keyword" = { fg = "red1" } -"keyword.directive" = "red0" -"namespace" = "aqua1" -"punctuation" = "orange1" -"punctuation.delimiter" = "orange1" -"operator" = "purple1" -"special" = "purple0" -"variable.other.member" = "blue1" -"variable" = "fg1" -"variable.builtin" = "orange1" -"variable.parameter" = "fg2" -"type" = "yellow1" -"type.builtin" = "yellow1" -"constructor" = { fg = "purple1", modifiers = ["bold"] } -"function" = { fg = "green1", modifiers = ["bold"] } -"function.macro" = "aqua1" -"function.builtin" = "yellow1" -"tag" = "red1" -"comment" = { fg = "gray1", modifiers = ["italic"] } +"annotation" = { fg = "fg1" } + +"attribute" = { fg = "aqua1", modifiers = ["italic"] } + +"comment" = { fg = "gray", modifiers = ["italic"] } + "constant" = { fg = "purple1" } -"constant.builtin" = { fg = "purple1", modifiers = ["bold"] } -"string" = "green1" -"constant.numeric" = "purple1" -"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] } -"label" = "aqua1" -"module" = "aqua1" - -"diff.plus" = "green1" -"diff.delta" = "orange1" -"diff.minus" = "red1" - -"warning" = "yellow1" -"error" = "red1" -"info" = "aqua1" -"hint" = "blue1" +"constant.character" = { fg = "aqua1" } +"constant.character.escape" = { fg = "orange1" } +"constant.macro" = { fg = "aqua1" } +"constructor" = { fg = "purple1" } + +"definition" = { underline = { color = "aqua1" } } + +"diagnostic" = { underline = { color = "orange1", style = "curl" } } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } +"diagnostic.error" = { underline = { color = "red1", style = "curl" } } +"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } } +"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } } +"diagnostic.warning" = { underline = { color = "yellow1", style = "curl" } } +# "diagnostic.unnecessary" = { modifiers = ["dim"] } # do not remove this for future resolving + +"error" = { fg = "red1" } +"hint" = { fg = "blue1" } +"info" = { fg = "aqua1" } +"warning" = { fg = "yellow1" } + +"diff.delta" = { fg = "yellow1" } +"diff.minus" = { fg = "red1" } +"diff.plus" = { fg = "green1" } + +"function" = { fg = "green1" } +"function.builtin" = { fg = "yellow1" } +"function.macro" = { fg = "blue1" } + +"keyword" = { fg = "red1" } +"keyword.control.import" = { fg = "aqua1" } + +"label" = { fg = "red1" } + +"markup.bold" = { modifiers = ["bold"] } +"markup.heading" = "aqua1" +"markup.italic" = { modifiers = ["italic"] } +"markup.link.text" = "red1" +"markup.link.url" = { fg = "green1", modifiers = ["underlined"] } +"markup.raw" = "red1" +"markup.strikethrough" = { modifiers = ["crossed_out"] } + +"module" = { fg = "aqua1" } + +"namespace" = { fg = "fg1" } + +"operator" = { fg = "purple1" } + +"punctuation" = { fg = "orange1" } + +"special" = { fg = "purple0" } + +"string" = { fg = "green1" } +"string.regexp" = { fg = "orange1" } +"string.special" = { fg = "orange1" } +"string.symbol" = { fg = "yellow1" } + +"tag" = { fg = "aqua1" } + +"type" = { fg = "yellow1" } +"type.enum.variant" = { modifiers = ["italic"] } "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" } -"ui.statusline.select" = { fg = "fg1", bg = "orange0" } -"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" } "ui.bufferline" = { fg = "fg1", bg = "bg1" } "ui.bufferline.active" = { fg = "bg0", bg = "yellow0" } "ui.bufferline.background" = { bg = "bg2" } -"ui.popup" = { bg = "bg1" } -"ui.window" = { bg = "bg1" } + +"ui.cursor" = { fg = "bg1", bg = "bg2" } +"ui.cursor.insert" = { fg = "bg1", bg = "blue0" } +"ui.cursor.normal" = { fg = "bg1", bg = "gray" } +"ui.cursor.select" = { fg = "bg1", bg = "orange0" } +"ui.cursor.match" = { fg = "fg3", bg = "bg3" } + +"ui.cursor.primary" = { bg = "fg3", fg = "bg1" } +"ui.cursor.primary.insert" = { fg = "bg1", bg = "blue1" } +"ui.cursor.primary.normal" = { fg = "bg1", bg = "fg3" } +"ui.cursor.primary.select" = { fg = "bg1", bg = "orange1" } + +"ui.cursorline" = { bg = "bg0_s" } +"ui.cursorline.primary" = { bg = "bg1" } + "ui.help" = { bg = "bg1", fg = "fg1" } -"ui.text" = { fg = "fg1" } -"ui.text.focus" = { fg = "fg1" } -"ui.selection" = { bg = "bg2" } -"ui.selection.primary" = { bg = "bg3" } -"ui.cursor.primary" = { bg = "fg4", fg = "bg1" } -"ui.cursor.match" = { bg = "bg3" } +"ui.linenr" = { fg = "bg3" } +"ui.linenr.selected" = { fg = "yellow1" } "ui.menu" = { fg = "fg1", bg = "bg2" } "ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] } -"ui.virtual.whitespace" = "bg2" +"ui.popup" = { bg = "bg1" } +"ui.selection" = { bg = "bg2" } +"ui.selection.primary" = { bg = "bg3" } + +"ui.statusline" = { fg = "fg1", bg = "bg2" } +"ui.statusline.inactive" = { fg = "fg4", bg = "bg2" } +"ui.statusline.insert" = { fg = "bg1", bg = "blue1", modifiers = ["bold"] } +"ui.statusline.normal" = { fg = "bg1", bg = "fg3", modifiers = ["bold"] } +"ui.statusline.select" = { fg = "bg1", bg = "orange1", modifiers = ["bold"] } + +"ui.text" = { fg = "fg1" } +"ui.virtual.inlay-hint" = { fg = "gray" } +"ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] } "ui.virtual.ruler" = { bg = "bg1" } -"ui.virtual.inlay-hint" = { fg = "gray1" } +"ui.virtual.whitespace" = "bg2" "ui.virtual.wrap" = { fg = "bg2" } -"ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] } +"ui.window" = { bg = "bg1" } -"diagnostic.warning" = { underline = { color = "yellow1", style = "curl" } } -"diagnostic.error" = { underline = { color = "red1", style = "curl" } } -"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } } -"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } +"variable" = { fg = "fg1" } +"variable.builtin" = { fg = "orange1", modifiers = ["italic"] } +"variable.other.member" = { fg = "blue1" } +"variable.parameter" = { fg = "blue1", modifiers = ["italic"] } -"markup.heading" = "aqua1" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "green1", modifiers = ["underlined"] } -"markup.link.text" = "red1" -"markup.raw" = "red1" [palette] -bg0 = "#282828" # main background +bg0 = "#282828" # main background +bg0_s = "#32302f" bg1 = "#3c3836" bg2 = "#504945" bg3 = "#665c54" @@ -93,13 +129,12 @@ fg0 = "#fbf1c7" fg1 = "#ebdbb2" # main foreground fg2 = "#d5c4a1" fg3 = "#bdae93" -fg4 = "#a89984" # gray0 +fg4 = "#a89984" -gray0 = "#a89984" -gray1 = "#928374" +gray = "#928374" -red0 = "#cc241d" # neutral -red1 = "#fb4934" # bright +red0 = "#cc241d" # neutral +red1 = "#fb4934" # bright green0 = "#98971a" green1 = "#b8bb26" yellow0 = "#d79921"