aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmnikar2021-12-03 03:34:54 +0000
committerBlaž Hrastnik2021-12-13 15:48:45 +0000
commit42e6d96a75c743c2fa8da6c8a0587487b3c21bf0 (patch)
tree35a897a49f4f713a05dd122214a55d2873cb2c34
parentd9727868dd7a496d33a321faeacfcd02d8c1c06e (diff)
Use `base16_tty` as 16-color default, fix theme name
-rw-r--r--base16_theme.toml (renamed from runtime/themes/base16_tty.toml)0
-rw-r--r--helix-view/src/theme.rs5
-rw-r--r--runtime/themes/base16_terminal.toml (renamed from base16_terminal.toml)0
3 files changed, 2 insertions, 3 deletions
diff --git a/runtime/themes/base16_tty.toml b/base16_theme.toml
index e1d1647b..e1d1647b 100644
--- a/runtime/themes/base16_tty.toml
+++ b/base16_theme.toml
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 6ca021a9..4a2ecbba 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -16,7 +16,7 @@ pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
});
pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
- toml::from_slice(include_bytes!("../../base16_tty.toml"))
+ toml::from_slice(include_bytes!("../../base16_theme.toml"))
.expect("Failed to parse base 16 default theme")
});
@@ -150,8 +150,7 @@ impl Theme {
}
pub fn get(&self, scope: &str) -> Style {
- self.try_get(scope)
- .unwrap_or_default()
+ self.try_get(scope).unwrap_or_default()
}
pub fn try_get(&self, scope: &str) -> Option<Style> {
diff --git a/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index a76cfd7e..a76cfd7e 100644
--- a/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml