From 335ed7fa6953ae95a9f8ff376b53228bcef80cfe Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne
Date: Mon, 15 Nov 2021 22:34:25 -0500
Subject: Improve Solarzed Dark theme (#1105)

Adjusts the Solarized Dark theme to be modeled more closely after
vim's incarnation. Also adjust the Solarized Light theme to match.---
 runtime/themes/solarized_dark.toml  | 54 +++++++++++++++----------------------
 runtime/themes/solarized_light.toml | 19 +++----------
 2 files changed, 25 insertions(+), 48 deletions(-)

(limited to 'runtime/themes')

diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 499c171a..afcafd54 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -2,15 +2,9 @@
 "keyword" = { fg = "green" }
 "keyword.directive" = { fg = "orange" }
 "namespace" = { fg = "violet" }
-"punctuation" = { fg = "orange" }
-"punctuation.delimiter" = { fg = "orange" }
 "operator" = { fg = "green" }
 "special" = { fg = "orange" }
-# "property" = { fg = "cyan" }
-"variable" = { fg = "cyan" }
-"variable.parameter" = { fg = "cyan" }
 "variable.builtin" = { fg = "cyan", modifiers = ["bold"] }
-"variable.other.member" = { fg = "cyan" }
 "variable.function" = { fg = "blue" }
 "type" = { fg = "yellow" }
 "type.builtin" = { fg = "yellow", modifiers = ["bold"] }
@@ -19,14 +13,10 @@
 "function.macro" = { fg = "magenta" }
 "function.builtin" = { fg = "blue", modifiers = ["bold"] }
 "function.special" = { fg = "magenta" }
-"comment" = { fg = "base01", modifiers = ["italic"] }
-"string" = { fg= "base1" }
-"constant" = { fg = "base1" }
-"constant.character" = { fg = "base1" }
-"constant.builtin" = { fg = "base1", modifiers = ["bold"] }
-"constant.numeric" = { fg= "base1" }
-"constant.numeric.integer" = { fg= "base1" }
-"constant.numeric.float" = { fg= "base1" }
+"comment" = { fg = "base01" }
+"string" = { fg = "cyan" }
+"constant" = { fg = "cyan" }
+"constant.builtin" = { fg = "cyan", modifiers = ["bold"] }
 "constant.character.escape" = { fg = "red", modifiers = ["bold"] }
 "label" = { fg = "green" }
 "module" = { fg = "violet" }
@@ -79,7 +69,6 @@
 # 当前光标匹配的标点符号
 "ui.cursor.match" = {modifiers = ["reversed"]}
 
-
 "warning" =  { fg = "orange", modifiers= ["bold", "underlined"] }
 "error" = { fg = "red", modifiers= ["bold", "underlined"] }
 "info" = { fg = "blue", modifiers= ["bold", "underlined"] }
@@ -87,23 +76,22 @@
 "diagnostic" = { mdifiers = ["underlined"] }
 
 [palette]
-red     	= '#dc322f'
-green   	= '#859900'
-yellow  	= '#b58900'
-blue    	= '#268bd2'
-magenta 	= '#d33682'
-cyan    	= '#2aa198'
-orange  	= '#cb4b16'
-violet  	= '#6c71c4'
-
 # 深色 越来越深
-base0   	= '#839496'
-base1   	= '#93a1a1'
-base2   	= '#eee8d5'
-base3   	= '#fdf6e3'
+base03  = "#002b36"
+base02  = "#073642"
+base01  = "#586e75"
+base00  = "#657b83"
+base0   = "#839496"
+base1   = "#93a1a1"
+base2   = "#eee8d5"
+base3   = "#fdf6e3"
 
-## 浅色 越來越浅
-base00  	= '#657b63'
-base01  	= '#586e75'
-base02  	= '#073642'
-base03  	= '#002b36'
+# 浅色 越來越浅
+yellow  = "#b58900"
+orange  = "#cb4b16"
+red     = "#dc322f"
+magenta = "#d33682"
+violet  = "#6c71c4"
+blue    = "#268bd2"
+cyan    = "#2aa198"
+green   = "#859900"
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index 19ff0a5f..aec5bf48 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -2,15 +2,9 @@
 "keyword" = { fg = "green" }
 "keyword.directive" = { fg = "orange" }
 "namespace" = { fg = "violet" }
-"punctuation" = { fg = "orange" }
-"punctuation.delimiter" = { fg = "orange" }
 "operator" = { fg = "green" }
 "special" = { fg = "orange" }
-# "property" = { fg = "cyan" }
-"variable" = { fg = "cyan" }
-"variable.parameter" = { fg = "cyan" }
 "variable.builtin" = { fg = "cyan", modifiers = ["bold"] }
-"variable.other.member" = { fg = "cyan" }
 "variable.function" = { fg = "blue" }
 "type" = { fg = "yellow" }
 "type.builtin" = { fg = "yellow", modifiers = ["bold"] }
@@ -19,14 +13,10 @@
 "function.macro" = { fg = "magenta" }
 "function.builtin" = { fg = "blue", modifiers = ["bold"] }
 "function.special" = { fg = "magenta" }
-"comment" = { fg = "base01", modifiers = ["italic"] }
-"string" = { fg= "base1" }
-"constant" = { fg = "base1" }
-"constant.character" = { fg = "base1" }
-"constant.builtin" = { fg = "base1", modifiers = ["bold"] }
-"constant.numeric" = { fg= "base1" }
-"constant.numeric.integer" = { fg= "base1" }
-"constant.numeric.float" = { fg= "base1" }
+"comment" = { fg = "base01" }
+"string" = { fg = "cyan" }
+"constant" = { fg = "cyan" }
+"constant.builtin" = { fg = "cyan", modifiers = ["bold"] }
 "constant.character.escape" = { fg = "red", modifiers = ["bold"] }
 "label" = { fg = "green" }
 "module" = { fg = "violet" }
@@ -79,7 +69,6 @@
 # 当前光标匹配的标点符号
 "ui.cursor.match" = {modifiers = ["reversed"]}
 
-
 "warning" =  { fg = "orange", modifiers= ["bold", "underlined"] }
 "error" = { fg = "red", modifiers= ["bold", "underlined"] }
 "info" = { fg = "blue", modifiers= ["bold", "underlined"] }
-- 
cgit v1.2.3-70-g09d2