Solarized theme: fix popup colors, adjust menu (#1124)

* fix popup colors, adjust menu * fix hardcoded horizontal rule color
helix-editor · Nov 20, 2021 · 05c6cb1 · 05c6cb1
1 parent a3a3b0b
commit 05c6cb1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
@@ -55,7 +55,7 @@ fn parse<'a>(
     fn to_span(text: pulldown_cmark::CowStr) -> Span {
         use std::ops::Deref;
         Span::raw::<std::borrow::Cow<_>>(match text {
-            CowStr::Borrowed(s) => s.to_string().into(), // could retain borrow
+            CowStr::Borrowed(s) => s.into(),
             CowStr::Boxed(s) => s.to_string().into(),
             CowStr::Inlined(s) => s.deref().to_owned().into(),
         })
@@ -179,7 +179,9 @@ fn parse<'a>(
                 spans.push(Span::raw(" "));
             }
             Event::Rule => {
-                lines.push(Spans::from("---"));
+                let mut span = Span::raw("---");
+                span.style = code_style;
+                lines.push(Spans::from(span));
                 lines.push(Spans::default());
             }
             // TaskListMarker(bool) true if checked

diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
@@ -28,18 +28,18 @@
 # 行号栏
 "ui.linenr" = { fg = "base0", bg = "base02" }
 # 当前行号栏
-"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
+"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
 
 # 状态栏
-"ui.statusline" = { fg = "base02", bg = "base1" }
+"ui.statusline" = { fg = "base03", bg = "base0" }
 # 非活动状态栏
-"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
+"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
 
 # 补全窗口, preview窗口
-"ui.popup" = { bg = "base1" }
+"ui.popup" = { bg = "base02" }
 # 影响 补全选中 cmd弹出信息选中
-"ui.menu.selected" = { fg = "base02", bg = "violet"}
-"ui.menu" = { fg = "base02" }
+"ui.menu.selected" = { fg = "base02", bg = "base2"}
+"ui.menu" = { fg = "base1" }
 # ??
 "ui.window" = { fg = "base3" }
 # 命令行 补全的帮助信息

diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
@@ -28,18 +28,18 @@
 # 行号栏
 "ui.linenr" = { fg = "base0", bg = "base02" }
 # 当前行号栏
-"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
+"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
 
 # 状态栏
-"ui.statusline" = { fg = "base02", bg = "base1" }
+"ui.statusline" = { fg = "base03", bg = "base0" }
 # 非活动状态栏
-"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
+"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
 
 # 补全窗口, preview窗口
-"ui.popup" = { bg = "base1" }
+"ui.popup" = { bg = "base02" }
 # 影响 补全选中 cmd弹出信息选中
-"ui.menu.selected" = { fg = "base02", bg = "violet"}
-"ui.menu" = { fg = "base02" }
+"ui.menu.selected" = { fg = "base02", bg = "base2"}
+"ui.menu" = { fg = "base1" }
 # ??
 "ui.window" = { fg = "base3" }
 # 命令行 补全的帮助信息