From e9d43c284bb717e3de5aec7312d985a088ede7ea Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp
Date: Wed, 7 Dec 2022 02:08:34 +0100
Subject: Fleetish theme renamed to fleet dark and adjusted to match official
 theme.  (#4997)

* remove fleetish.toml

* add fleet_dark.toml

* adjust colors for tags and markup lists

* Add type.enum.variant

* correct color for focused elements

* adjust builtins and keywords

Co-authored-by: krfl <kr.fl@outlook.com>---
 runtime/themes/fleet_dark.toml | 130 +++++++++++++++++++++++++++++++++++++++++
 runtime/themes/fleetish.toml   | 121 --------------------------------------
 2 files changed, 130 insertions(+), 121 deletions(-)
 create mode 100644 runtime/themes/fleet_dark.toml
 delete mode 100644 runtime/themes/fleetish.toml

(limited to 'runtime')

diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml
new file mode 100644
index 00000000..f885e4eb
--- /dev/null
+++ b/runtime/themes/fleet_dark.toml
@@ -0,0 +1,130 @@
+# Fleet Dark
+# A take on the JetBrains Fleet theme. Feel free to contribute
+
+# Original author: @krfl
+# Contributors:
+# @matoous
+
+"attribute" = "green"
+"type" = "light_blue"
+"type.enum.variant" = "purple"
+"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" = "cyan" # .conditional / .repeat / .import / .return / .exception
+"keyword.control.exception" = "purple"
+"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" = "light_blue"
+"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" = "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"
+"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.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 = "focus" } # .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"
+focus = "#204474"
diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml
deleted file mode 100644
index 159daf87..00000000
--- a/runtime/themes/fleetish.toml
+++ /dev/null
@@ -1,121 +0,0 @@
-# Author: Kristoffer Flottorp <kr.fl@outlook.com>
-# 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"
-- 
cgit v1.2.3-70-g09d2