From 77de6a0451f6a15851c6d507faa7321c6378c972 Mon Sep 17 00:00:00 2001 From: krfl Date: Sat, 3 Dec 2022 23:16:25 +0100 Subject: [PATCH 1/6] remove fleetish.toml --- runtime/themes/fleetish.toml | 121 ----------------------------------- 1 file changed, 121 deletions(-) delete mode 100644 runtime/themes/fleetish.toml diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml deleted file mode 100644 index 159daf8785d0..000000000000 --- a/runtime/themes/fleetish.toml +++ /dev/null @@ -1,121 +0,0 @@ -# Author: Kristoffer Flottorp -# A take on the JetBrains Fleet theme sprinkled with some creative freedom - -"type" = "light_blue" -"type.builtin" = "orange" -"constructor" = "yellow" -"constant" = "cyan" -# "constant.builtin" = {} # .boolean -"constant.builtin.boolean" = "yellow" -"constant.character" = "yellow" -"constant.characted.escape" = "light" -"constant.numeric" = "yellow" -"string" = "pink" -"string.regexp" = "light" -"string.special" = { fg = "yellow", modifiers = ["underlined"] } #.path / .url / .symbol -"comment" = "light_gray" # .line -# "comment.block" = {} # .documentation -"variable" = "light" # .builtin -"variable.parameter" = "light" -# "variable.other" = {} # .member -"variable.other.member" = "yellow" -"label" = "yellow" -"punctuation" = "light" # .delimiter / .bracket -"keyword" = "cyan" # .operator / .directive / .function -"keyword.control" = "yellow" # .conditional / .repeat / .import / .return / .exception -"operator" = "light" -"function" = "yellow" -"function.macro" = "green" -"function.builtin" = "green" -"function.special" = "green" -"function.method" = "light" -"tag" = "green" -"special" = "green" -"namespace" = "light" - -# used in theming -# "markup.normal" = {} # .completion / .hover -# "markup.raw.inline" = {} # .completion / .hover -"markup" = "purple" # .quote -"markup.bold" = { fg = "purple", modifiers = ["bold"] } -"markup.italic" = { fg = "purple", modifiers = ["italic"] } -"markup.heading" = "light" # .marker -"markup.heading.1" = "yellow" -"markup.heading.2" = "green" -"markup.heading.3" = "pink" -"markup.heading.4" = "purple" -"markup.heading.5" = "cyan" -"markup.heading.6" = "light_blue" -"markup.list" = "cyan" # .unnumbered / .numbered -"markup.link" = "green" -"markup.link.url" = "pink" -"markup.link.text" = "cyan" -"markup.link.label" = "yellow" -"markup.raw" = "pink" # .inline -"markup.raw.block" = "orange" - -"diff.plus" = "cyan" -"diff.minus" = "yellow" -"diff.delta" = "purple" - -# ui specific -"ui.background" = { bg = "#0d0d0d" } # .separator -"ui.cursor" = { bg = "dark_gray", modifiers = ["reversed"] } # .insert / .select / .match / .primary -"ui.cursor.match" = { fg = "light", bg = "blue_accent" } # .insert / .select / .match / .primary -"ui.cursorline" = { bg = "darker" } -"ui.linenr" = "dark_gray" -"ui.linenr.selected" = { fg = "light_gray", bg = "darker" } -"ui.statusline" = { fg = "light", bg = "darker" } # .inactive / .normal / .insert / .select -"ui.statusline.inactive" = { fg = "dark", bg = "darker" } -"ui.statusline.normal" = { fg = "lightest", bg = "darker"} -"ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" } -"ui.statusline.select" = { fg = "lightest", bg = "orange_accent" } -"ui.popup" = { fg = "light", bg = "darkest" } # .info -"ui.window" = { fg = "dark", bg = "darkest" } -"ui.help" = { fg = "light", bg = "darkest" } -"ui.text" = "light" # .focus / .info -"ui.virtual" = "dark" # .whitespace -"ui.virtual.ruler" = { bg = "darker"} -"ui.menu" = { fg = "light", bg = "darker" } # .selected -"ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected -"ui.selection" = { bg = "darker" } # .primary -"ui.selection.primary" = { bg = "select" } # .primary -"hint" = "blue" -"info" = "yellow_accent" -"warning" = "orange_accent" -"error" = "red" -"diagnostic" = { modifiers = [] } -"diagnostic.hint" = { underline = { color = "light", style = "curl" } } -"diagnostic.info" = { underline = { color = "blue", style = "curl" } } -"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } } -"diagnostic.error" = { underline = { color = "red", style = "curl" } } - -[palette] -darkest = "#1e1e1e" -darker = "#262626" -dark = "#898989" -select = "#102f5b" - -light = "#d6d6dd" -lightest = "#ffffff" - -dark_gray = "#535353" -light_gray = "#6d6d6d" -purple = "#a390f0" -light_blue = "#7dbeff" -blue = "#52a7f6" -pink = "#d898d8" -green = "#afcb85" -cyan = "#78d0bd" -orange = "#efb080" -yellow = "#e5c995" -red = "#f44747" - -blue_accent = "#2197F3" -pink_accent = "#E44C7A" -green_accent = "#00AF99" -orange_accent = "#EE7F25" -yellow_accent = "#DEA407" - -# variables intended for future updates -checkmark = "#44B254" From c4a8ff912ae458244ce86d27700377aef19ce767 Mon Sep 17 00:00:00 2001 From: krfl Date: Sat, 3 Dec 2022 23:16:49 +0100 Subject: [PATCH 2/6] add fleet_dark.toml --- runtime/themes/fleet_dark.toml | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 runtime/themes/fleet_dark.toml diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml new file mode 100644 index 000000000000..3d29d3629813 --- /dev/null +++ b/runtime/themes/fleet_dark.toml @@ -0,0 +1,125 @@ +# Fleet Dark +# A take on the JetBrains Fleet theme. Feel free to contribute + +# Original author: @krfl +# Contributors: +# @matoous + +"type" = "light_blue" +"type.builtin" = "orange" +"constructor" = "yellow" +"constant" = "cyan" +# "constant.builtin" = {} # .boolean +"constant.builtin.boolean" = "yellow" +"constant.character" = "yellow" +"constant.characted.escape" = "light" +"constant.numeric" = "yellow" +"string" = "pink" +"string.regexp" = "light" +"string.special" = { fg = "yellow", modifiers = ["underlined"] } #.path / .url / .symbol +"comment" = "light_gray" # .line +# "comment.block" = {} # .documentation +"variable" = "light" # .builtin +"variable.builtin" = { fg = "red", modifiers = ["underlined"] } +"variable.parameter" = "light" +# "variable.other" = {} # .member +"variable.other.member" = "purple" +"label" = "yellow" +"punctuation" = "light" # .delimiter / .bracket +"keyword" = "cyan" # .operator / .directive / .function +"keyword.control" = "yellow" # .conditional / .repeat / .import / .return / .exception +"keyword.control.return" = "cyan" +"operator" = "light" +"function" = "yellow" +"function.macro" = "green" +"function.builtin" = "green" +"function.special" = "green" +"function.method" = "light" +#"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892 +"tag" = "green" +"special" = "green" +"namespace" = "light" + +# used in theming +# "markup" = {} # .normal / .quote / .raw +# "markup.normal" = {} # .completion / .hover +"markup.bold" = { fg = "lightest", modifiers = ["bold"] } +"markup.italic" = { modifiers = ["italic"] } +"markup.heading" = { fg = "cyan", modifiers = ["bold"] } # .marker / .1 / .2 / .3 / .4 / .5 / .6 +"markup.list" = "cyan" # .unnumbered / .numbered +# "markup.link" = "green" +"markup.link.url" = { fg = "pink", modifiers = ['italic', 'underlined'] } +"markup.link.text" = "cyan" +"markup.link.label" = "purple" +"markup.quote" = "pink" +"markup.raw" = "pink" +"markup.raw.inline" = "cyan" # .completion / .hover +"markup.raw.block" = "pink" + +"diff.plus" = "diff_plus" +"diff.minus" = "red_accent" +"diff.delta" = "blue_accent" + +# ui specific +"ui.background" = { bg = "background" } # .separator +"ui.cursor" = { bg = "dark_gray", modifiers = ["reversed"] } # .insert / .select / .match / .primary +"ui.cursor.match" = { fg = "light", bg = "selection" } # .insert / .select / .match / .primary +"ui.cursorline" = { bg = "darker" } +"ui.linenr" = "dark_gray" +"ui.linenr.selected" = { fg = "light", bg = "darker" } +"ui.statusline" = { fg = "light", bg = "darker" } # .inactive / .normal / .insert / .select +"ui.statusline.inactive" = { fg = "dark", bg = "darker" } +"ui.statusline.normal" = { fg = "lightest", bg = "darker"} +"ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" } +"ui.statusline.select" = { fg = "lightest", bg = "orange_accent" } +"ui.popup" = { fg = "light", bg = "darkest" } # .info +"ui.window" = { fg = "dark", bg = "darkest" } +"ui.help" = { fg = "light", bg = "darkest" } +"ui.text" = "light" # .focus / .info +"ui.virtual" = "dark" # .whitespace +"ui.virtual.ruler" = { bg = "darker"} +"ui.menu" = { fg = "light", bg = "darkest" } # .selected +"ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected +"ui.selection" = { bg = "darker" } # .primary +"ui.selection.primary" = { bg = "selection" } +"hint" = "blue" +"info" = "yellow_accent" +"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" } } + +[palette] +background = "#181818" +darkest = "#1e1e1e" +darker = "#292929" +dark = "#898989" + +light = "#d6d6dd" +lightest = "#ffffff" + +dark_gray = "#535353" +light_gray = "#6d6d6d" +purple = "#a390f0" +light_blue = "#7dbeff" +blue = "#52a7f6" +pink = "#d898d8" +green = "#afcb85" +cyan = "#78d0bd" +orange = "#efb080" +yellow = "#e5c995" +red = "#CC7C8A" + +blue_accent = "#2197F3" +pink_accent = "#E44C7A" +green_accent = "#00AF99" +orange_accent = "#EE7F25" +yellow_accent = "#DEA407" +red_accent = "#F44747" + +red_error = "#EB5F6A" +selection = "#1F3661" +diff_plus = "#5A9F81" From 15a78c8f2c330bccbbfc652e0996b49413812c67 Mon Sep 17 00:00:00 2001 From: krfl Date: Sun, 4 Dec 2022 00:20:55 +0100 Subject: [PATCH 3/6] adjust colors for tags and markup lists --- runtime/themes/fleet_dark.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml index 3d29d3629813..5ab876c26d0a 100644 --- a/runtime/themes/fleet_dark.toml +++ b/runtime/themes/fleet_dark.toml @@ -5,6 +5,7 @@ # Contributors: # @matoous +"attribute" = "green" "type" = "light_blue" "type.builtin" = "orange" "constructor" = "yellow" @@ -36,7 +37,7 @@ "function.special" = "green" "function.method" = "light" #"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892 -"tag" = "green" +"tag" = "light_blue" "special" = "green" "namespace" = "light" @@ -46,7 +47,9 @@ "markup.bold" = { fg = "lightest", modifiers = ["bold"] } "markup.italic" = { modifiers = ["italic"] } "markup.heading" = { fg = "cyan", modifiers = ["bold"] } # .marker / .1 / .2 / .3 / .4 / .5 / .6 -"markup.list" = "cyan" # .unnumbered / .numbered +"markup.list" = "pink" # .unnumbered / .numbered +"markup.list.numbered" = "cyan" +"markup.list.unnumbered" = "cyan" # "markup.link" = "green" "markup.link.url" = { fg = "pink", modifiers = ['italic', 'underlined'] } "markup.link.text" = "cyan" From 9b51c09491ade8994b06408b5e85a76db46cb849 Mon Sep 17 00:00:00 2001 From: krfl Date: Sun, 4 Dec 2022 09:27:45 +0100 Subject: [PATCH 4/6] Add type.enum.variant --- runtime/themes/fleet_dark.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml index 5ab876c26d0a..02b538953ce4 100644 --- a/runtime/themes/fleet_dark.toml +++ b/runtime/themes/fleet_dark.toml @@ -7,6 +7,7 @@ "attribute" = "green" "type" = "light_blue" +"type.enum.variant" = "purple" "type.builtin" = "orange" "constructor" = "yellow" "constant" = "cyan" From c6def1b39a5fcb5e0c747cd43cdbf751ef052cc2 Mon Sep 17 00:00:00 2001 From: krfl Date: Mon, 5 Dec 2022 08:46:13 +0100 Subject: [PATCH 5/6] correct color for focused elements --- runtime/themes/fleet_dark.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml index 02b538953ce4..2285ac5d4974 100644 --- a/runtime/themes/fleet_dark.toml +++ b/runtime/themes/fleet_dark.toml @@ -80,10 +80,11 @@ "ui.window" = { fg = "dark", bg = "darkest" } "ui.help" = { fg = "light", bg = "darkest" } "ui.text" = "light" # .focus / .info +"ui.text.focus" = { fg = "lightest", bg = "focus" } "ui.virtual" = "dark" # .whitespace "ui.virtual.ruler" = { bg = "darker"} "ui.menu" = { fg = "light", bg = "darkest" } # .selected -"ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected +"ui.menu.selected" = { fg = "lightest", bg = "focus" } # .selected "ui.selection" = { bg = "darker" } # .primary "ui.selection.primary" = { bg = "selection" } "hint" = "blue" @@ -127,3 +128,4 @@ red_accent = "#F44747" red_error = "#EB5F6A" selection = "#1F3661" diff_plus = "#5A9F81" +focus = "#204474" From 285b7fd535377d6d9283093804c043241e73bc13 Mon Sep 17 00:00:00 2001 From: krfl Date: Wed, 7 Dec 2022 01:18:43 +0100 Subject: [PATCH 6/6] adjust builtins and keywords --- runtime/themes/fleet_dark.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml index 2285ac5d4974..f885e4eb6542 100644 --- a/runtime/themes/fleet_dark.toml +++ b/runtime/themes/fleet_dark.toml @@ -8,7 +8,6 @@ "attribute" = "green" "type" = "light_blue" "type.enum.variant" = "purple" -"type.builtin" = "orange" "constructor" = "yellow" "constant" = "cyan" # "constant.builtin" = {} # .boolean @@ -29,8 +28,8 @@ "label" = "yellow" "punctuation" = "light" # .delimiter / .bracket "keyword" = "cyan" # .operator / .directive / .function -"keyword.control" = "yellow" # .conditional / .repeat / .import / .return / .exception -"keyword.control.return" = "cyan" +# "keyword.control" = "cyan" # .conditional / .repeat / .import / .return / .exception +"keyword.control.exception" = "purple" "operator" = "light" "function" = "yellow" "function.macro" = "green"