on master help sign in
Solarized theme: fix popup colors, adjust menu (#1124)
05c6cb1Skyler Hawthorne
helix-term/src/ui/markdown.rs+4−2
@@ -55,7 +55,7 @@ fn parse<'a>(
55 fn to_span(text: pulldown_cmark::CowStr) -> Span {
55 fn to_span(text: pulldown_cmark::CowStr) -> Span {
56 use std::ops::Deref;
56 use std::ops::Deref;
57 Span::raw::<std::borrow::Cow<_>>(match text {
57 Span::raw::<std::borrow::Cow<_>>(match text {
58− CowStr::Borrowed(s) => s.to_string().into(), // could retain borrow
58+ CowStr::Borrowed(s) => s.into(),
59 CowStr::Boxed(s) => s.to_string().into(),
59 CowStr::Boxed(s) => s.to_string().into(),
60 CowStr::Inlined(s) => s.deref().to_owned().into(),
60 CowStr::Inlined(s) => s.deref().to_owned().into(),
61 })
61 })
@@ -179,7 +179,9 @@ fn parse<'a>(
179 spans.push(Span::raw(" "));
179 spans.push(Span::raw(" "));
180 }
180 }
181 Event::Rule => {
181 Event::Rule => {
182+ let mut span = Span::raw("---");
183+ span.style = code_style;
182− lines.push(Spans::from("---"));
184+ lines.push(Spans::from(span));
183 lines.push(Spans::default());
185 lines.push(Spans::default());
184 }
186 }
185 // TaskListMarker(bool) true if checked
187 // TaskListMarker(bool) true if checked
runtime/themes/solarized_dark.toml+6−6
@@ -28,18 +28,18 @@
28# 行号栏
28# 行号栏
29"ui.linenr" = { fg = "base0", bg = "base02" }
29"ui.linenr" = { fg = "base0", bg = "base02" }
30# 当前行号栏
30# 当前行号栏
31−"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
31+"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
32
32
33# 状态栏
33# 状态栏
34−"ui.statusline" = { fg = "base02", bg = "base1" }
34+"ui.statusline" = { fg = "base03", bg = "base0" }
35# 非活动状态栏
35# 非活动状态栏
36−"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
36+"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
37
37
38# 补全窗口, preview窗口
38# 补全窗口, preview窗口
39−"ui.popup" = { bg = "base1" }
39+"ui.popup" = { bg = "base02" }
40# 影响 补全选中 cmd弹出信息选中
40# 影响 补全选中 cmd弹出信息选中
41−"ui.menu.selected" = { fg = "base02", bg = "violet"}
41+"ui.menu.selected" = { fg = "base02", bg = "base2"}
42−"ui.menu" = { fg = "base02" }
42+"ui.menu" = { fg = "base1" }
43# ??
43# ??
44"ui.window" = { fg = "base3" }
44"ui.window" = { fg = "base3" }
45# 命令行 补全的帮助信息
45# 命令行 补全的帮助信息
runtime/themes/solarized_light.toml+6−6
@@ -28,18 +28,18 @@
28# 行号栏
28# 行号栏
29"ui.linenr" = { fg = "base0", bg = "base02" }
29"ui.linenr" = { fg = "base0", bg = "base02" }
30# 当前行号栏
30# 当前行号栏
31−"ui.linenr.selected" = { fg = "red", modifiers = ["bold"] }
31+"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
32
32
33# 状态栏
33# 状态栏
34−"ui.statusline" = { fg = "base02", bg = "base1" }
34+"ui.statusline" = { fg = "base03", bg = "base0" }
35# 非活动状态栏
35# 非活动状态栏
36−"ui.statusline.inactive" = { fg = "base02", bg = "base00" }
36+"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
37
37
38# 补全窗口, preview窗口
38# 补全窗口, preview窗口
39−"ui.popup" = { bg = "base1" }
39+"ui.popup" = { bg = "base02" }
40# 影响 补全选中 cmd弹出信息选中
40# 影响 补全选中 cmd弹出信息选中
41−"ui.menu.selected" = { fg = "base02", bg = "violet"}
41+"ui.menu.selected" = { fg = "base02", bg = "base2"}
42−"ui.menu" = { fg = "base02" }
42+"ui.menu" = { fg = "base1" }
43# ??
43# ??
44"ui.window" = { fg = "base3" }
44"ui.window" = { fg = "base3" }
45# 命令行 补全的帮助信息
45# 命令行 补全的帮助信息