diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-11-11 08:08:53 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-11-12 14:59:15 +1100 |
commit | 1ac3ae1ad1b904a02e12d49adec0197e6067006e (patch) | |
tree | 9648ea2b0cf513ce6393753fa1381c5819f4d5ba /pkg | |
parent | 34404162e6e80ca6bc2b417b99433cd8f49dbf51 (diff) |
use better colour defaults
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/config/user_config.go | 4 | ||||
-rw-r--r-- | pkg/gui/style/basic_styles.go | 1 | ||||
-rw-r--r-- | pkg/theme/theme.go | 15 |
3 files changed, 4 insertions, 16 deletions
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index a90b100d5..c31c74fe0 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -55,7 +55,6 @@ type GuiConfig struct { } type ThemeConfig struct { - LightTheme bool `yaml:"lightTheme"` ActiveBorderColor []string `yaml:"activeBorderColor"` InactiveBorderColor []string `yaml:"inactiveBorderColor"` OptionsTextColor []string `yaml:"optionsTextColor"` @@ -358,9 +357,8 @@ func GetDefaultConfig() *UserConfig { Language: "auto", TimeFormat: time.RFC822, Theme: ThemeConfig{ - LightTheme: false, ActiveBorderColor: []string{"green", "bold"}, - InactiveBorderColor: []string{"white"}, + InactiveBorderColor: []string{"default"}, OptionsTextColor: []string{"blue"}, SelectedLineBgColor: []string{"blue"}, SelectedRangeBgColor: []string{"blue"}, diff --git a/pkg/gui/style/basic_styles.go b/pkg/gui/style/basic_styles.go index 99db37e20..e37e90001 100644 --- a/pkg/gui/style/basic_styles.go +++ b/pkg/gui/style/basic_styles.go @@ -27,6 +27,7 @@ var ( BgBlue = FromBasicBg(color.BgBlue) BgMagenta = FromBasicBg(color.BgMagenta) BgCyan = FromBasicBg(color.BgCyan) + BgDefault = FromBasicBg(color.BgDefault) // will not print any colour escape codes, including the reset escape code Nothing = New() diff --git a/pkg/theme/theme.go b/pkg/theme/theme.go index 39347702a..0970e08b7 100644 --- a/pkg/theme/theme.go +++ b/pkg/theme/theme.go @@ -24,9 +24,6 @@ var ( // DefaultTextColor is the default text color DefaultTextColor = style.FgWhite - // DefaultHiTextColor is the default highlighted text color - DefaultHiTextColor = style.FgLightWhite - // SelectedLineBgColor is the background color for the selected line SelectedLineBgColor = style.New() @@ -61,14 +58,6 @@ func UpdateTheme(themeConfig config.ThemeConfig) { OptionsColor = GetGocuiStyle(themeConfig.OptionsTextColor) OptionsFgColor = GetTextStyle(themeConfig.OptionsTextColor, false) - isLightTheme := themeConfig.LightTheme - if isLightTheme { - DefaultTextColor = style.FgBlack - DefaultHiTextColor = style.FgBlackLighter - GocuiDefaultTextColor = gocui.ColorBlack - } else { - DefaultTextColor = style.FgWhite - DefaultHiTextColor = style.FgLightWhite - GocuiDefaultTextColor = gocui.ColorWhite - } + DefaultTextColor = style.FgDefault + GocuiDefaultTextColor = gocui.ColorDefault } |