From 24a9e05ffdea439d37b9a8b37c461c2e7a6d6d01 Mon Sep 17 00:00:00 2001 From: Rohit K Viswanath Date: Wed, 16 Nov 2022 12:17:21 +0530 Subject: [PATCH 1/4] Add theme: Mellow --- runtime/themes/mellow.toml | 148 +++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 runtime/themes/mellow.toml diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml new file mode 100644 index 000000000000..276c5f25012e --- /dev/null +++ b/runtime/themes/mellow.toml @@ -0,0 +1,148 @@ +# Author : Rohit K Viswanath +# Theme: Mellow + +"attribute" = { fg = "blue", modifiers = ["italic"] } + +"keyword" = "blue" +"keyword.control.conditional" = { fg = "blue", modifiers = ["italic"] } +"keyword.directive" = "magenta" # -- preprocessor comments (#if in C) + +"namespace" = { fg = "cyan", modifiers = ["italic"] } + +"punctuation" = "gray06" +"punctuation.delimiter" = "gray06" + +"operator" = "yellow" +"special" = "yellow" + +"variable" = "fg" +"variable.builtin" = "bright_blue" +"variable.parameter" = "cyan" +"variable.other.member" = "white" + +"type" = "bright_blue" +"type.builtin" = "magenta" +"type.enum.variant" = "magenta" + +"constructor" = "yellow" + +"function" = "white" +"function.macro" = "bright_cyan" +"function.builtin" = "bright_blue" + +"tag" = "cyan" +"comment" = { fg = "gray05", modifiers = ["italic"] } + +"string" = "green" +"string.regexp" = "green" +"string.special" = "yellow" + +"constant" = "cyan" +"constant.builtin" = "yellow" +"constant.numeric" = "magenta" +"constant.character.escape" = "cyan" + +# used for lifetimes +"label" = "yellow" + +"markup.heading.marker" = { fg = "gray06" } +"markup.heading.1" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.heading.2" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.heading.3" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.heading.4" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.heading.5" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.heading.6" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.list" = "gray06" +"markup.bold" = { modifiers = ["bold"] } +"markup.italic" = { modifiers = ["italic"] } +"markup.link.url" = { fg = "green", modifiers = ["underlined"] } +"markup.link.text" = { fg = "blue", modifiers = ["italic"] } +"markup.raw" = "yellow" + +"diff.plus" = "bright_green" +"diff.minus" = "bright_red" +"diff.delta" = "bright_blue" + +"ui.background" = { bg = "bg" } +"ui.background.separator" = { fg = "fg" } + +"ui.linenr" = { fg = "gray04" } +"ui.linenr.selected" = { fg = "fg" } + +"ui.statusline" = { fg = "fg", bg = "gray01" } +"ui.statusline.inactive" = { fg = "fg", bg = "gray01", modifiers = ["dim"] } +"ui.statusline.normal" = { fg = "bg", bg = "cyan", modifiers = ["bold"] } +"ui.statusline.insert" = { fg = "bg", bg = "blue", modifiers = ["bold"] } +"ui.statusline.select" = { fg = "bg", bg = "magenta", modifiers = ["bold"] } + +"ui.popup" = { bg = "gray01" } +"ui.window" = { fg = "gray02" } +"ui.help" = { bg = "gray01", fg = "white" } + +"ui.text" = { fg = "fg" } +"ui.text.focus" = { fg = "fg" } + +"ui.virtual" = { fg = "gray02" } +"ui.virtual.indent-guide" = { fg = "gray02" } + +"ui.selection" = { bg = "gray03" } +"ui.selection.primary" = { bg = "gray03" } + +"ui.cursor" = { bg = "gray04" } +"ui.cursor.insert" = { bg = "gray04" } +"ui.cursor.match" = { fg = "yellow", modifiers = ["bold", "underlined"] } +"ui.cursor.select" = { bg = "gray04" } +"ui.cursorline.primary" = { bg = "gray01" } + +"ui.highlight" = { bg = "gray02" } + +"ui.menu" = { fg = "white", bg = "gray01" } +"ui.menu.selected" = { fg = "bright_white", bg = "gray03" } +"ui.menu.scroll" = { fg = "gray04", bg = "gray01" } + +diagnostic = { modifiers = ["underlined"] } + +warning = "bright_yellow" +error = "bright_red" +info = "bright_blue" +hint = "bright_cyan" + +[palette] +bg = "#161617" +fg = "#c9c7cd" +bg_dark = "#131314" + +black = "#27272a" +bright_black = "#353539" + +red = "#f5a191" +bright_red = "#ffae9f" + +#green = "#a6a5b5" +#bright_green = "#b2b1c1" + +green = "#90b99f" +bright_green = "#9dc6ac" + +yellow = "#e6b99d" +bright_yellow = "#f0c5a9" + +blue = "#aca1cf" +bright_blue = "#b9aeda" + +magenta = "#e29eca" +bright_magenta = "#ecaad6" + +cyan = "#ea83a5" +bright_cyan = "#f591b2" + +white = "#c1c0d4" +bright_white = "#cac9dd" + +gray01 = "#1b1b1d" +gray02 = "#2a2a2d" +gray03 = "#3e3e43" +gray04 = "#57575f" +gray05 = "#757581" +gray06 = "#9998a8" +gray07 = "#c1c0d4" From abc8629d571042a811b7400966241c19e9d5cac2 Mon Sep 17 00:00:00 2001 From: Rohit K Viswanath Date: Wed, 16 Nov 2022 12:54:39 +0530 Subject: [PATCH 2/4] Simplify highlights for markdown headings --- runtime/themes/mellow.toml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml index 276c5f25012e..e5aea970e5ca 100644 --- a/runtime/themes/mellow.toml +++ b/runtime/themes/mellow.toml @@ -46,12 +46,7 @@ "label" = "yellow" "markup.heading.marker" = { fg = "gray06" } -"markup.heading.1" = { fg = "bright_blue", modifiers = ["bold"] } -"markup.heading.2" = { fg = "bright_blue", modifiers = ["bold"] } -"markup.heading.3" = { fg = "bright_blue", modifiers = ["bold"] } -"markup.heading.4" = { fg = "bright_blue", modifiers = ["bold"] } -"markup.heading.5" = { fg = "bright_blue", modifiers = ["bold"] } -"markup.heading.6" = { fg = "bright_blue", modifiers = ["bold"] } +"markup.heading" = { fg = "bright_blue", modifiers = ["bold"] } "markup.list" = "gray06" "markup.bold" = { modifiers = ["bold"] } "markup.italic" = { modifiers = ["italic"] } From 448bbe95f58ffdbd711fea0fede4c0a2e06c6caa Mon Sep 17 00:00:00 2001 From: Rohit K Viswanath Date: Wed, 16 Nov 2022 13:03:54 +0530 Subject: [PATCH 3/4] Remove unused colors (comments) --- runtime/themes/mellow.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml index e5aea970e5ca..902ecc727c85 100644 --- a/runtime/themes/mellow.toml +++ b/runtime/themes/mellow.toml @@ -113,9 +113,6 @@ bright_black = "#353539" red = "#f5a191" bright_red = "#ffae9f" -#green = "#a6a5b5" -#bright_green = "#b2b1c1" - green = "#90b99f" bright_green = "#9dc6ac" From 4f2551a5a354d6fc2481f77281b463656d5f6233 Mon Sep 17 00:00:00 2001 From: Rohit K Viswanath Date: Fri, 18 Nov 2022 11:19:36 +0530 Subject: [PATCH 4/4] Update runtime/themes/mellow.toml Simplify UI cursor highlights. Co-authored-by: Michael Davis --- runtime/themes/mellow.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml index 902ecc727c85..675cd916087f 100644 --- a/runtime/themes/mellow.toml +++ b/runtime/themes/mellow.toml @@ -84,9 +84,7 @@ "ui.selection.primary" = { bg = "gray03" } "ui.cursor" = { bg = "gray04" } -"ui.cursor.insert" = { bg = "gray04" } "ui.cursor.match" = { fg = "yellow", modifiers = ["bold", "underlined"] } -"ui.cursor.select" = { bg = "gray04" } "ui.cursorline.primary" = { bg = "gray01" } "ui.highlight" = { bg = "gray02" }