From f901e0a9c856f39c5b82f38d37fc0f5493ed10be Mon Sep 17 00:00:00 2001
From: Daniel Poulin <dan.poulin@digitalsurgeons.com>
Date: Fri, 5 Aug 2022 20:29:02 -0400
Subject: [PATCH 1/2] Attempt to bring spacebones light up to speed with recent
 features

* Adds cursorline (primary and secondary)
* Reworks colors slightly to try and match upstream theme better
* Distinguishes primary from regular selections
* Implements some of the markup specific styles
* Implements mode colors support
---
 runtime/themes/spacebones_light.toml | 54 +++++++++++++++++++---------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index b088e2d3eb88..10ac9a4e2d60 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -24,57 +24,77 @@
 "comment" = { fg = "#a49da5", modifiers = ["italic"]  }
 "constant" = { fg = "#6c3163" }
 "constant.builtin" = { fg = "#6c3163", modifiers = ["bold"] }
-"string" = "#2d9574"
+"string" = "theme_aqua"
 "number" = "#6c3163"
 "escape" = { fg = "fg2", modifiers = ["bold"] }
 "label" = "#b1951d"
 "module" = "#b1951d"
 
 # TODO
-"markup.heading" = "blue"
-"markup.list" = "red"
-"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
-"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
-"markup.link.text" = "red"
-"markup.quote" = "cyan"
-"markup.raw" = "green"
+"markup.heading" = "theme_blue"
+"markup.list" = "theme_red"
+"markup.bold" = { fg = "theme_yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "theme_magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "theme_yellow", modifiers = ["underlined"] }
+"markup.link.text" = "theme_red"
+"markup.quote" = "theme_cyan"
+"markup.raw" = "theme_green"
 
-"diff.plus" = "#2d9574"
+"diff.plus" = "theme_aqua"
 "diff.delta" = "#715ab1"
 "diff.minus" = "#ba2f59"
 
-"warning" = { fg = "#da8b55" }
+"warning" = { fg = "meta" }
 "error" = { fg = "#e0211d" }
-"info" = { fg = "#b1951d" }
-"hint" = { fg = "#d1dcdf" }
+"info" = { fg = "theme_yellow" }
+"hint" = { fg = "bg2" }
 
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg3" }
-"ui.linenr.selected" = { fg = "#b1951d" }
+"ui.linenr.selected" = { fg = "theme_yellow" }
 "ui.statusline" = { fg = "fg1", bg = "bg2" }
 "ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }
+"ui.statusline.normal" = { fg = "bg1", bg = "theme_cyan" }
+"ui.statusline.insert" = { fg = "bg1", bg = "theme_green" }
+"ui.statusline.select" = { fg = "bg1", bg = "theme_magenta" }
 "ui.popup" = { bg = "bg1" }
 "ui.window" = { bg = "bg1" }
 "ui.help" = { bg = "bg1", fg = "fg1" }
 "ui.text" = { fg = "fg1" }
 "ui.text.focus" = { fg = "fg1" }
-"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
+"ui.selection" = { bg = "hl2" }
+"ui.selection.primary" = { bg = "hl1" }
 "ui.cursor.primary" = { modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "bg3" }
+"ui.cursorline.primary" = { bg = "bg1" }
 "ui.menu" = { fg = "fg1", bg = "bg2" }
-"ui.menu.selected" = { fg = "#655370", bg = "#d1dcdf", modifiers = ["bold"] }
-"ui.virtual.whitespace" = "bg2"
+"ui.menu.selected" = { fg = "base", bg = "bg2", modifiers = ["bold"] }
+"ui.virtual" = "base-dim"
 
 "diagnostic" = { modifiers = ["underlined"] }
 
 [palette]
+base = "#655370"
+base-dim = "#a094a2"
+meta = "#da8b55"
+
 bg0 = "#fbf8ef"
 bg1 = "#efeae9"
 bg2 = "#d1dcdf"
 bg3 = "#b4c6cb"
 
+hl1 = "#d3d3e7"
+hl2 = "#e7e7fc"
+
 fg1 = "#655370"
 fg2 = "#5f3bc4"
 fg3 = "#bdae93"
 fg4 = "#a89984"
+
+theme_magenta = "#a31db1"
+theme_blue = "#3a81c3"
+theme_yellow = "#b1951d"
+theme_cyan = "#21b8c7"
+theme_aqua = "#2d9574"
+theme_green = "#67b11d"
+theme_red = "#c10e0b"

From 3194c8dd7a207862d0162c190906bc17de4f7390 Mon Sep 17 00:00:00 2001
From: Daniel Poulin <dan.poulin@digitalsurgeons.com>
Date: Sat, 6 Aug 2022 09:56:13 -0400
Subject: [PATCH 2/2] Add support for rulers

---
 runtime/themes/spacebones_light.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index 10ac9a4e2d60..57071af2a0f5 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -70,6 +70,7 @@
 "ui.menu" = { fg = "fg1", bg = "bg2" }
 "ui.menu.selected" = { fg = "base", bg = "bg2", modifiers = ["bold"] }
 "ui.virtual" = "base-dim"
+"ui.virtual.ruler" = { bg = "bg1" }
 
 "diagnostic" = { modifiers = ["underlined"] }