From a1d3f9770171f8c4efc98ced6be6ac31b1e02069 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 14 Aug 2023 17:22:18 +0200 Subject: [PATCH 1/4] Improve readability of comments --- runtime/themes/autumn.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml index 23af7d6f5fe9..877defb6a8fe 100644 --- a/runtime/themes/autumn.toml +++ b/runtime/themes/autumn.toml @@ -15,7 +15,7 @@ "ui.window" = { fg = "my_gray3", bg = "my_gray2" } "ui.linenr.selected" = { fg = "my_gray7", bg = "my_gray0"} "ui.selection" = { bg = "my_gray3" } -"comment" = { fg = "my_gray5", modifiers = ["italic"] } +"comment" = { fg = "my_gray5" } "ui.cursorline" = { bg = "my_gray3" } "ui.statusline" = { fg = "my_gray7", bg = "my_gray2" } "ui.statusline.inactive" = { fg = 'my_gray5', bg = 'my_gray2' } From 215842ea970d2f5dc67e108cbba4880f828bedc2 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 14 Aug 2023 17:32:34 +0200 Subject: [PATCH 2/4] Rename color --- runtime/themes/autumn.toml | 14 +++++++------- runtime/themes/autumn_night.toml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml index 877defb6a8fe..63e05ff95339 100644 --- a/runtime/themes/autumn.toml +++ b/runtime/themes/autumn.toml @@ -8,7 +8,7 @@ # Author: Jens Getreu "ui.background" = { bg = "my_gray0" } -"ui.menu" = { fg = "my_white", bg = "my_gray2" } +"ui.menu" = { fg = "my_white1", bg = "my_gray2" } "ui.menu.selected" = { fg = "my_gray2", bg = "my_gray6" } "ui.linenr" = { fg = "my_gray3", bg = "my_gray0" } "ui.popup" = { bg = "my_gray2" } @@ -23,15 +23,15 @@ "ui.statusline.normal" = {fg = "my_gray7", bg = "my_gray2"} "ui.statusline.select" = {fg = "my_gray7", bg = "my_black", modifiers = ["bold"]} "ui.cursor" = { bg = "my_white4", fg = "my_black" } -"ui.cursor.primary" = { fg = "my_white", modifiers = ["reversed"] } -"ui.cursor.match" = { fg = "my_white", modifiers = ["bold"], underline = { style = "double_line", color = "my_white" }, bg = "my_black"} +"ui.cursor.primary" = { fg = "my_white1", modifiers = ["reversed"] } +"ui.cursor.match" = { fg = "my_white1", modifiers = ["bold"], underline = { style = "double_line", color = "my_white1" }, bg = "my_black"} "ui.cursorline.primary" = { bg = "my_black" } "ui.cursorline.secondary" = { bg = "my_black" } "ui.highlight.frameline" = { bg = "#8b6904" } "ui.debug" = { fg = "my_yellow1", bg = "my_gray0" } -"ui.text" = "my_white" -"operator" = "my_white" -"ui.text.focus" = "my_white" +"ui.text" = "my_white1" +"operator" = "my_white1" +"ui.text.focus" = "my_white1" "variable" = "my_white3" "constant.numeric" = "my_turquoise" "constant" = "my_white3" @@ -91,7 +91,7 @@ my_gray5 = "#646f69" # Comments, Invisibles, Line Highlighting my_gray6 = "#a8a8a8" # Dark Foreground (Used for status bars) my_gray7 = "#c8c8c8" # Light Foreground my_gray8 = "#e8e8e8" # Light Background -my_white = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators +my_white1 = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators my_white2 = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted my_white3 = "#F3F2CC" # Classes, Markup Bold, Search Text Background my_white4 = "#7e7d6a" # Cursor match diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml index 493976263493..faa8b06d79a6 100644 --- a/runtime/themes/autumn_night.toml +++ b/runtime/themes/autumn_night.toml @@ -20,7 +20,7 @@ my_gray5 = "#626C66" # Comments, Invisibles, Line Highlighting my_gray6 = "#aaaaaa" # Dark Foreground (Used for status bars) my_gray7 = "#c4c4c4" # Light Foreground my_gray8 = "#e8e8e8" # Light Background -my_white = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators +my_white1 = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators my_white2 = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted my_white3 = "#F3F2CC" # Classes, Markup Bold, Search Text Background my_white4 = "#7e7d6a" # Secondary cursors From be0140fdee10bbcde097a689bca98863612e2ba5 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 14 Aug 2023 17:34:46 +0200 Subject: [PATCH 3/4] Rename color --- runtime/themes/autumn.toml | 8 ++++---- runtime/themes/autumn_night.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml index 63e05ff95339..1c38c6d426b0 100644 --- a/runtime/themes/autumn.toml +++ b/runtime/themes/autumn.toml @@ -33,13 +33,13 @@ "operator" = "my_white1" "ui.text.focus" = "my_white1" "variable" = "my_white3" -"constant.numeric" = "my_turquoise" +"constant.numeric" = "my_turquoise1" "constant" = "my_white3" -"attribute" = "my_turquoise" +"attribute" = "my_turquoise1" "type" = { fg = "my_white3", modifiers = ["italic"] } "string" = "my_green" "variable.other.member" = "my_brown" -"constant.character.escape" = "my_turquoise" +"constant.character.escape" = "my_turquoise1" "function" = "my_yellow1" "constructor" = "my_yellow1" "special" = "my_yellow1" @@ -95,7 +95,7 @@ my_white1 = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators my_white2 = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted my_white3 = "#F3F2CC" # Classes, Markup Bold, Search Text Background my_white4 = "#7e7d6a" # Cursor match -my_turquoise = "#86c1b9" # Support, Regular Expressions, Escape Characters +my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters my_turquoise2 = "#72a59e" # URL my_green = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted my_brown = "#cfba8b" # Member variables, Quotes diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml index faa8b06d79a6..8b1d6f94fff6 100644 --- a/runtime/themes/autumn_night.toml +++ b/runtime/themes/autumn_night.toml @@ -24,7 +24,7 @@ my_white1 = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators my_white2 = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted my_white3 = "#F3F2CC" # Classes, Markup Bold, Search Text Background my_white4 = "#7e7d6a" # Secondary cursors -my_turquoise = "#86c1b9" # Support, Regular Expressions, Escape Characters +my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters my_turquoise2 = "#72a59e" # URL my_green = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted my_brown = "#cfba8b" # Member variables, Quotes From 1a62b656235ad2f955f5f5ad35d20601de598ce8 Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Mon, 14 Aug 2023 17:38:43 +0200 Subject: [PATCH 4/4] Sort variables --- runtime/themes/autumn.toml | 121 +++++++++++++++---------------- runtime/themes/autumn_night.toml | 10 +-- 2 files changed, 64 insertions(+), 67 deletions(-) diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml index 1c38c6d426b0..ce684a6a68bb 100644 --- a/runtime/themes/autumn.toml +++ b/runtime/themes/autumn.toml @@ -7,81 +7,79 @@ # Jens Getreu ported and optimised the color theme for the Helix editor. # Author: Jens Getreu +"attribute" = "my_turquoise1" +"comment" = { fg = "my_gray5" } +"constant.character.escape" = "my_turquoise1" +"constant" = "my_white3" +"constant.numeric" = "my_turquoise1" +"constructor" = "my_yellow1" +"debug" = "my_yellow2" +"diagnostic.error" = { underline = { style = "curl", color = "my_red" } } +"diagnostic.hint" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"} +"diagnostic.info" = { underline = { style = "line" } } +"diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"} +"diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } } +"diff.delta" = "my_gray5" +"diff.minus" = "my_red" +"diff.plus" = "my_green" +"error" = "my_red" +"function" = "my_yellow1" +"hint" = "my_gray6" +"info" = "my_yellow2" +"keyword" = "my_red" +"label" = "my_red" +"markup.bold" = { modifiers = ["bold"] } +"markup.heading" = "my_yellow1" +"markup.italic" = { modifiers = ["italic"] } +"markup.link.text" = "my_white2" +"markup.link.url" = "my_turquoise2" +"markup.list" = "my_white2" +"markup.quote" = "my_brown" +"markup.raw" = "my_green" +"markup.strikethrough" = { modifiers = ["crossed_out"] } +"namespace" = "my_white3" +"operator" = "my_white1" +"special" = "my_yellow1" +"string" = "my_green" +"type" = { fg = "my_white3", modifiers = ["italic"] } "ui.background" = { bg = "my_gray0" } +"ui.cursor" = { bg = "my_white4", fg = "my_black" } +"ui.cursorline" = { bg = "my_gray3" } +"ui.cursorline.primary" = { bg = "my_black" } +"ui.cursorline.secondary" = { bg = "my_black" } +"ui.cursor.match" = { fg = "my_white1", modifiers = ["bold"], underline = { style = "double_line", color = "my_white1" }, bg = "my_black"} +"ui.cursor.primary" = { fg = "my_white1", modifiers = ["reversed"] } +"ui.debug" = { fg = "my_yellow1", bg = "my_gray0" } +"ui.gutter" = { bg = "my_gray0" } +"ui.help" = { fg = "my_gray7", bg = "my_gray2" } +"ui.highlight.frameline" = { bg = "#8b6904" } +"ui.linenr" = { fg = "my_gray3", bg = "my_gray0" } +"ui.linenr.selected" = { fg = "my_gray7", bg = "my_gray0"} "ui.menu" = { fg = "my_white1", bg = "my_gray2" } "ui.menu.selected" = { fg = "my_gray2", bg = "my_gray6" } -"ui.linenr" = { fg = "my_gray3", bg = "my_gray0" } "ui.popup" = { bg = "my_gray2" } -"ui.window" = { fg = "my_gray3", bg = "my_gray2" } -"ui.linenr.selected" = { fg = "my_gray7", bg = "my_gray0"} "ui.selection" = { bg = "my_gray3" } -"comment" = { fg = "my_gray5" } -"ui.cursorline" = { bg = "my_gray3" } "ui.statusline" = { fg = "my_gray7", bg = "my_gray2" } "ui.statusline.inactive" = { fg = 'my_gray5', bg = 'my_gray2' } "ui.statusline.insert" = {fg = "my_black", bg = "my_gray6", modifiers = ["bold"]} "ui.statusline.normal" = {fg = "my_gray7", bg = "my_gray2"} "ui.statusline.select" = {fg = "my_gray7", bg = "my_black", modifiers = ["bold"]} -"ui.cursor" = { bg = "my_white4", fg = "my_black" } -"ui.cursor.primary" = { fg = "my_white1", modifiers = ["reversed"] } -"ui.cursor.match" = { fg = "my_white1", modifiers = ["bold"], underline = { style = "double_line", color = "my_white1" }, bg = "my_black"} -"ui.cursorline.primary" = { bg = "my_black" } -"ui.cursorline.secondary" = { bg = "my_black" } -"ui.highlight.frameline" = { bg = "#8b6904" } -"ui.debug" = { fg = "my_yellow1", bg = "my_gray0" } -"ui.text" = "my_white1" -"operator" = "my_white1" "ui.text.focus" = "my_white1" -"variable" = "my_white3" -"constant.numeric" = "my_turquoise1" -"constant" = "my_white3" -"attribute" = "my_turquoise1" -"type" = { fg = "my_white3", modifiers = ["italic"] } -"string" = "my_green" -"variable.other.member" = "my_brown" -"constant.character.escape" = "my_turquoise1" -"function" = "my_yellow1" -"constructor" = "my_yellow1" -"special" = "my_yellow1" -"keyword" = "my_red" -"label" = "my_red" -"namespace" = "my_white3" -"ui.help" = { fg = "my_gray7", bg = "my_gray2" } -"ui.virtual.wrap" = "my_gray4" -"ui.virtual.whitespace" = { fg = "my_gray6" } -"ui.virtual.ruler" = { bg = "my_gray1" } +"ui.text" = "my_white1" "ui.virtual.inlay-hint" = { fg = "my_gray4", bg="my_black", modifiers = ["normal"] } "ui.virtual.inlay-hint.parameter" = { fg = "my_gray4", modifiers = ["normal"] } "ui.virtual.inlay-hint.type" = { fg = "my_gray4", modifiers = ["italic"] } - -"markup.heading" = "my_yellow1" -"markup.list" = "my_white2" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = "my_turquoise2" -"markup.link.text" = "my_white2" -"markup.quote" = "my_brown" -"markup.raw" = "my_green" - -"diff.plus" = "my_green" -"diff.delta" = "my_gray5" -"diff.minus" = "my_red" - -"diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"} -"diagnostic.hint" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"} -"diagnostic.info" = { underline = { style = "line" } } -"diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } } -"diagnostic.error" = { underline = { style = "curl", color = "my_red" } } -"ui.gutter" = { bg = "my_gray0" } -"hint" = "my_gray6" -"debug" = "my_yellow2" -"info" = "my_yellow2" +"ui.virtual.ruler" = { bg = "my_gray1" } +"ui.virtual.whitespace" = { fg = "my_gray6" } +"ui.virtual.wrap" = "my_gray4" +"ui.window" = { fg = "my_gray3", bg = "my_gray2" } +"variable" = "my_white3" +"variable.other.member" = "my_brown" "warning" = "my_yellow2" -"error" = "my_red" [palette] my_black = "#212121" # Cursorline +my_brown = "#cfba8b" # Member variables, Quotes my_gray0 = "#232323" # Default Background my_gray1 = "#2b2b2b" # Ruler my_gray2 = "#323232" # Lighter Background (Used for status bars, line number and folding marks) @@ -91,14 +89,13 @@ my_gray5 = "#646f69" # Comments, Invisibles, Line Highlighting my_gray6 = "#a8a8a8" # Dark Foreground (Used for status bars) my_gray7 = "#c8c8c8" # Light Foreground my_gray8 = "#e8e8e8" # Light Background +my_green = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted +my_red = "#F05E48" # Keywords, Storage, Selector, Diff Changed +my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters +my_turquoise2 = "#72a59e" # URL my_white1 = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators my_white2 = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted my_white3 = "#F3F2CC" # Classes, Markup Bold, Search Text Background my_white4 = "#7e7d6a" # Cursor match -my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters -my_turquoise2 = "#72a59e" # URL -my_green = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted -my_brown = "#cfba8b" # Member variables, Quotes my_yellow1 = "#FAD566" # Functions, Methods, Attribute IDs, Headings my_yellow2 = "#ffff9f" # Debug, Info -my_red = "#F05E48" # Keywords, Storage, Selector, Diff Changed diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml index 8b1d6f94fff6..128baea3c4b1 100644 --- a/runtime/themes/autumn_night.toml +++ b/runtime/themes/autumn_night.toml @@ -11,6 +11,7 @@ inherits = "autumn" [palette] my_black = "#111111" # Cursorline +my_brown = "#cfba8b" # Member variables, Quotes my_gray0 = "#090909" # Default Background my_gray1 = "#0e0e0e" # Ruler my_gray2 = "#1a1a1a" # Lighter Background (Used for status bars, line number and folding marks) @@ -20,14 +21,13 @@ my_gray5 = "#626C66" # Comments, Invisibles, Line Highlighting my_gray6 = "#aaaaaa" # Dark Foreground (Used for status bars) my_gray7 = "#c4c4c4" # Light Foreground my_gray8 = "#e8e8e8" # Light Background +my_green = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted +my_red = "#F05E48" # Keywords, Storage, Selector, Diff Changed +my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters +my_turquoise2 = "#72a59e" # URL my_white1 = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators my_white2 = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted my_white3 = "#F3F2CC" # Classes, Markup Bold, Search Text Background my_white4 = "#7e7d6a" # Secondary cursors -my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters -my_turquoise2 = "#72a59e" # URL -my_green = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted -my_brown = "#cfba8b" # Member variables, Quotes my_yellow1 = "#FAD566" # Functions, Methods, Attribute IDs, Headings my_yellow2 = "#ffff9f" # Debug, Info -my_red = "#F05E48" # Keywords, Storage, Selector, Diff Changed