git.iko.soy/helix
on master help sign in
change to .unwrap_or_default() and fix ui.window and ui.statusline
commitd9727868dd7a496d33a321faeacfcd02d8c1c06e authorNNB <nnbnh@protonmail.com> dateThu 2 Dec 2021, 19:33 (5 years ago) parent3080be8
5 files changed+12−25
compare with master
unifiedsplit
base16_terminal.toml+3−7 helix-view/src/theme.rs+1−1 runtime/themes/base16_default_dark.toml+1−3 runtime/themes/base16_default_light.toml+1−3 runtime/themes/base16_tty.toml+6−11
base16_terminal.toml+3−7
@@ -1,7 +1,7 @@
11# Author: NNB <nnbnh@protonmail.com>
22
33"ui.menu" = "black"
4−"ui.menu.selected" = { fg = "white", bg = "black" }
4+"ui.menu.selected" = { modifiers = ["reversed"] }
55"ui.linenr" = { fg = "light-gray", bg = "black" }
66"ui.popup" = { bg = "black" }
77"ui.window" = { bg = "black" }
@@ -9,12 +9,10 @@
99"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
1010"comment" = { fg = "light-gray", modifiers = ["italic"] }
1111"ui.statusline" = { fg = "white", bg = "black" }
12+"ui.statusline.inactive" = { fg = "gray", bg = "black" }
1213"ui.help" = { fg = "white", bg = "black" }
1314"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
14−"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
15−"ui.text" = "white" #FIXME
16−"operator" = "white" #FIXME
17−"ui.text.focus" = "white" #FIXME
15+"ui.cursor.primary" = { modifiers = ["reversed"] }
1816"variable" = "light-red"
1917"constant.numeric" = "yellow"
2018"constant" = "yellow"
@@ -30,8 +28,6 @@
3028"keyword" = "light-magenta"
3129"label" = "light-magenta"
3230"namespace" = "light-magenta"
33−"ui.popup" = { bg = "black" }
34−"ui.window" = { bg = "base00" }
3531"ui.help" = { fg = "white", bg = "black" }
3632
3733"info" = "light-gray"
helix-view/src/theme.rs+1−1
@@ -151,7 +151,7 @@ impl Theme {
151151
152152 pub fn get(&self, scope: &str) -> Style {
153153 self.try_get(scope)
154− .unwrap_or_else(|| Style::default().fg(Color::Rgb(0, 0, 255)))
154+ .unwrap_or_default()
155155 }
156156
157157 pub fn try_get(&self, scope: &str) -> Option<Style> {
runtime/themes/base16_default_dark.toml+1−3
@@ -2,7 +2,7 @@
22
33"ui.background" = { bg = "base00" }
44"ui.menu" = "base01"
5−"ui.menu.selected" = { fg = "base04", bg = "base01" }
5+"ui.menu.selected" = { fg = "base01", bg = "base04" }
66"ui.linenr" = { fg = "base03", bg = "base01" }
77"ui.popup" = { bg = "base01" }
88"ui.window" = { bg = "base01" }
@@ -31,8 +31,6 @@
3131"keyword" = "base0E"
3232"label" = "base0E"
3333"namespace" = "base0E"
34−"ui.popup" = { bg = "base01" }
35−"ui.window" = { bg = "base00" }
3634"ui.help" = { fg = "base06", bg = "base01" }
3735
3836"info" = "base03"
runtime/themes/base16_default_light.toml+1−3
@@ -2,7 +2,7 @@
22
33"ui.background" = { bg = "base00" }
44"ui.menu" = "base01"
5−"ui.menu.selected" = { fg = "base04", bg = "base01" }
5+"ui.menu.selected" = { fg = "base01", bg = "base04" }
66"ui.linenr" = { fg = "base03", bg = "base01" }
77"ui.popup" = { bg = "base01" }
88"ui.window" = { bg = "base01" }
@@ -31,8 +31,6 @@
3131"keyword" = "base0E"
3232"label" = "base0E"
3333"namespace" = "base0E"
34−"ui.popup" = { bg = "base01" }
35−"ui.window" = { bg = "base00" }
3634"ui.help" = { fg = "base06", bg = "base01" }
3735
3836"info" = "base03"
runtime/themes/base16_tty.toml+6−11
@@ -1,20 +1,17 @@
11# Author: NNB <nnbnh@protonmail.com>
22
33"ui.menu" = "black"
4−"ui.menu.selected" = { fg = "white", bg = "black" }
4+"ui.menu.selected" = { modifiers = ["reversed"] }
55"ui.linenr" = { fg = "gray", bg = "black" }
6−"ui.popup" = { bg = "black" }
7−"ui.window" = { bg = "black" }
6+"ui.popup" = { modifiers = ["reversed"] }
87"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
98"ui.selection" = { fg = "black", bg = "blue" }
109"ui.selection.primary" = { fg = "white", bg = "blue" }
1110"comment" = { fg = "gray" }
12−"ui.statusline" = { fg = "white", bg = "black" }
13−"ui.help" = { fg = "white", bg = "black" }
14−"ui.cursor" = { fg = "white", modifiers = ["reversed"] } #FIXME
15−"ui.text" = "white" #FIXME
16−"operator" = "white" #FIXME
17−"ui.text.focus" = "white" #FIXME
11+"ui.statusline" = { fg = "black", bg = "white" }
12+"ui.statusline.inactive" = { fg = "gray", bg = "white" }
13+"ui.help" = { modifiers = ["reversed"] }
14+"ui.cursor" = { modifiers = ["reversed"] }
1815"variable" = "red"
1916"constant.numeric" = "yellow"
2017"constant" = "yellow"
@@ -30,8 +27,6 @@
3027"keyword" = "magenta"
3128"label" = "magenta"
3229"namespace" = "magenta"
33−"ui.popup" = { bg = "black" }
34−"ui.window" = { bg = "base00" }
3530"ui.help" = { fg = "white", bg = "black" }
3631
3732"info" = "gray"