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

* fix popup colors, adjust menu

* fix hardcoded horizontal rule color
pull/1140/head
Skyler Hawthorne 3 years ago committed by GitHub
parent a3a3b0b517
commit 05c6cb1d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -55,7 +55,7 @@ fn parse<'a>(
fn to_span(text: pulldown_cmark::CowStr) -> Span { fn to_span(text: pulldown_cmark::CowStr) -> Span {
use std::ops::Deref; use std::ops::Deref;
Span::raw::<std::borrow::Cow<_>>(match text { 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::Boxed(s) => s.to_string().into(),
CowStr::Inlined(s) => s.deref().to_owned().into(), CowStr::Inlined(s) => s.deref().to_owned().into(),
}) })
@ -179,7 +179,9 @@ fn parse<'a>(
spans.push(Span::raw(" ")); spans.push(Span::raw(" "));
} }
Event::Rule => { Event::Rule => {
lines.push(Spans::from("---")); let mut span = Span::raw("---");
span.style = code_style;
lines.push(Spans::from(span));
lines.push(Spans::default()); lines.push(Spans::default());
} }
// TaskListMarker(bool) true if checked // TaskListMarker(bool) true if checked

@ -28,18 +28,18 @@
# 行号栏 # 行号栏
"ui.linenr" = { fg = "base0", bg = "base02" } "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窗口 # 补全窗口, preview窗口
"ui.popup" = { bg = "base1" } "ui.popup" = { bg = "base02" }
# 影响 补全选中 cmd弹出信息选中 # 影响 补全选中 cmd弹出信息选中
"ui.menu.selected" = { fg = "base02", bg = "violet"} "ui.menu.selected" = { fg = "base02", bg = "base2"}
"ui.menu" = { fg = "base02" } "ui.menu" = { fg = "base1" }
# ?? # ??
"ui.window" = { fg = "base3" } "ui.window" = { fg = "base3" }
# 命令行 补全的帮助信息 # 命令行 补全的帮助信息

@ -28,18 +28,18 @@
# 行号栏 # 行号栏
"ui.linenr" = { fg = "base0", bg = "base02" } "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窗口 # 补全窗口, preview窗口
"ui.popup" = { bg = "base1" } "ui.popup" = { bg = "base02" }
# 影响 补全选中 cmd弹出信息选中 # 影响 补全选中 cmd弹出信息选中
"ui.menu.selected" = { fg = "base02", bg = "violet"} "ui.menu.selected" = { fg = "base02", bg = "base2"}
"ui.menu" = { fg = "base02" } "ui.menu" = { fg = "base1" }
# ?? # ??
"ui.window" = { fg = "base3" } "ui.window" = { fg = "base3" }
# 命令行 补全的帮助信息 # 命令行 补全的帮助信息

Loading…
Cancel
Save