git.iko.soy/helix
on master help sign in
change to .unwrap_or_default() and fix ui.window and ui.statusline
d972786NNB
base16_terminal.toml+3−7
compare with master
unifiedsplit
@@ -1,7 +1,7 @@
1# Author: NNB <nnbnh@protonmail.com>
1# Author: NNB <nnbnh@protonmail.com>
2
2
3"ui.menu" = "black"
3"ui.menu" = "black"
4−"ui.menu.selected" = { fg = "white", bg = "black" }
4+"ui.menu.selected" = { modifiers = ["reversed"] }
5"ui.linenr" = { fg = "light-gray", bg = "black" }
5"ui.linenr" = { fg = "light-gray", bg = "black" }
6"ui.popup" = { bg = "black" }
6"ui.popup" = { bg = "black" }
7"ui.window" = { bg = "black" }
7"ui.window" = { bg = "black" }
@@ -9,12 +9,10 @@
9"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
9"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
10"comment" = { fg = "light-gray", modifiers = ["italic"] }
10"comment" = { fg = "light-gray", modifiers = ["italic"] }
11"ui.statusline" = { fg = "white", bg = "black" }
11"ui.statusline" = { fg = "white", bg = "black" }
12+"ui.statusline.inactive" = { fg = "gray", bg = "black" }
12"ui.help" = { fg = "white", bg = "black" }
13"ui.help" = { fg = "white", bg = "black" }
13"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
14"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
14−"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
15+"ui.cursor.primary" = { modifiers = ["reversed"] }
15−"ui.text" = "white" #FIXME
16−"operator" = "white" #FIXME
17−"ui.text.focus" = "white" #FIXME
18"variable" = "light-red"
16"variable" = "light-red"
19"constant.numeric" = "yellow"
17"constant.numeric" = "yellow"
20"constant" = "yellow"
18"constant" = "yellow"
@@ -30,8 +28,6 @@
30"keyword" = "light-magenta"
28"keyword" = "light-magenta"
31"label" = "light-magenta"
29"label" = "light-magenta"
32"namespace" = "light-magenta"
30"namespace" = "light-magenta"
33−"ui.popup" = { bg = "black" }
34−"ui.window" = { bg = "base00" }
35"ui.help" = { fg = "white", bg = "black" }
31"ui.help" = { fg = "white", bg = "black" }
36
32
37"info" = "light-gray"
33"info" = "light-gray"
helix-view/src/theme.rs+1−1
@@ -151,7 +151,7 @@ impl Theme {
151
151
152 pub fn get(&self, scope: &str) -> Style {
152 pub fn get(&self, scope: &str) -> Style {
153 self.try_get(scope)
153 self.try_get(scope)
154− .unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255)))
154+ .unwrap_or_default()
155 }
155 }
156
156
157 pub fn try_get(&self, scope: &str) -> Option<Style> {
157 pub fn try_get(&self, scope: &str) -> Option<Style> {
runtime/themes/base16_default_dark.toml+1−3
@@ -2,7 +2,7 @@
2
2
3"ui.background" = { bg = "base00" }
3"ui.background" = { bg = "base00" }
4"ui.menu" = "base01"
4"ui.menu" = "base01"
5−"ui.menu.selected" = { fg = "base04", bg = "base01" }
5+"ui.menu.selected" = { fg = "base01", bg = "base04" }
6"ui.linenr" = { fg = "base03", bg = "base01" }
6"ui.linenr" = { fg = "base03", bg = "base01" }
7"ui.popup" = { bg = "base01" }
7"ui.popup" = { bg = "base01" }
8"ui.window" = { bg = "base01" }
8"ui.window" = { bg = "base01" }
@@ -31,8 +31,6 @@
31"keyword" = "base0E"
31"keyword" = "base0E"
32"label" = "base0E"
32"label" = "base0E"
33"namespace" = "base0E"
33"namespace" = "base0E"
34−"ui.popup" = { bg = "base01" }
35−"ui.window" = { bg = "base00" }
36"ui.help" = { fg = "base06", bg = "base01" }
34"ui.help" = { fg = "base06", bg = "base01" }
37
35
38"info" = "base03"
36"info" = "base03"
runtime/themes/base16_default_light.toml+1−3
@@ -2,7 +2,7 @@
2
2
3"ui.background" = { bg = "base00" }
3"ui.background" = { bg = "base00" }
4"ui.menu" = "base01"
4"ui.menu" = "base01"
5−"ui.menu.selected" = { fg = "base04", bg = "base01" }
5+"ui.menu.selected" = { fg = "base01", bg = "base04" }
6"ui.linenr" = { fg = "base03", bg = "base01" }
6"ui.linenr" = { fg = "base03", bg = "base01" }
7"ui.popup" = { bg = "base01" }
7"ui.popup" = { bg = "base01" }
8"ui.window" = { bg = "base01" }
8"ui.window" = { bg = "base01" }
@@ -31,8 +31,6 @@
31"keyword" = "base0E"
31"keyword" = "base0E"
32"label" = "base0E"
32"label" = "base0E"
33"namespace" = "base0E"
33"namespace" = "base0E"
34−"ui.popup" = { bg = "base01" }
35−"ui.window" = { bg = "base00" }
36"ui.help" = { fg = "base06", bg = "base01" }
34"ui.help" = { fg = "base06", bg = "base01" }
37
35
38"info" = "base03"
36"info" = "base03"
runtime/themes/base16_tty.toml+6−11
@@ -1,20 +1,17 @@
1# Author: NNB <nnbnh@protonmail.com>
1# Author: NNB <nnbnh@protonmail.com>
2
2
3"ui.menu" = "black"
3"ui.menu" = "black"
4−"ui.menu.selected" = { fg = "white", bg = "black" }
4+"ui.menu.selected" = { modifiers = ["reversed"] }
5"ui.linenr" = { fg = "gray", bg = "black" }
5"ui.linenr" = { fg = "gray", bg = "black" }
6−"ui.popup" = { bg = "black" }
6+"ui.popup" = { modifiers = ["reversed"] }
7−"ui.window" = { bg = "black" }
8"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
7"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
9"ui.selection" = { fg = "black", bg = "blue" }
8"ui.selection" = { fg = "black", bg = "blue" }
10"ui.selection.primary" = { fg = "white", bg = "blue" }
9"ui.selection.primary" = { fg = "white", bg = "blue" }
11"comment" = { fg = "gray" }
10"comment" = { fg = "gray" }
12−"ui.statusline" = { fg = "white", bg = "black" }
11+"ui.statusline" = { fg = "black", bg = "white" }
13−"ui.help" = { fg = "white", bg = "black" }
12+"ui.statusline.inactive" = { fg = "gray", bg = "white" }
13+"ui.help" = { modifiers = ["reversed"] }
14−"ui.cursor" = { fg = "white", modifiers = ["reversed"] } #FIXME
14+"ui.cursor" = { modifiers = ["reversed"] }
15−"ui.text" = "white" #FIXME
16−"operator" = "white" #FIXME
17−"ui.text.focus" = "white" #FIXME
18"variable" = "red"
15"variable" = "red"
19"constant.numeric" = "yellow"
16"constant.numeric" = "yellow"
20"constant" = "yellow"
17"constant" = "yellow"
@@ -30,8 +27,6 @@
30"keyword" = "magenta"
27"keyword" = "magenta"
31"label" = "magenta"
28"label" = "magenta"
32"namespace" = "magenta"
29"namespace" = "magenta"
33−"ui.popup" = { bg = "black" }
34−"ui.window" = { bg = "base00" }
35"ui.help" = { fg = "white", bg = "black" }
30"ui.help" = { fg = "white", bg = "black" }
36
31
37"info" = "gray"
32"info" = "gray"