summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorSam Burville <Sam.Burville@GlobalProcessing.com>2021-09-29 14:00:56 +0100
committerJesse Duffield <jessedduffield@gmail.com>2021-09-30 01:26:05 +1000
commit268d4080b306148067dc37905147316cf1619f3a (patch)
tree673b10c99b3c69da6a8a266faea3a8fd81ebc64a /pkg
parent2c72990838296be85f150117b77c27194ebc3592 (diff)
Fix text formatting
Diffstat (limited to 'pkg')
-rw-r--r--pkg/config/user_config.go16
-rw-r--r--pkg/theme/theme.go6
2 files changed, 11 insertions, 11 deletions
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 78ff27c60..c4aee9985 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -44,14 +44,14 @@ type GuiConfig struct {
}
type ThemeConfig struct {
- LightTheme bool `yaml:"lightTheme"`
- ActiveBorderColor []string `yaml:"activeBorderColor"`
- InactiveBorderColor []string `yaml:"inactiveBorderColor"`
- OptionsTextColor []string `yaml:"optionsTextColor"`
- SelectedLineBgColor []string `yaml:"selectedLineBgColor"`
- SelectedRangeBgColor []string `yaml:"selectedRangeBgColor"`
- CherryPickedCommitBgColor []string `yaml:"cherryPickedCommitBgColor"`
- CherryPickedCommitFgColor []string `yaml:"cherryPickedCommitFgColor"`
+ LightTheme bool `yaml:"lightTheme"`
+ ActiveBorderColor []string `yaml:"activeBorderColor"`
+ InactiveBorderColor []string `yaml:"inactiveBorderColor"`
+ OptionsTextColor []string `yaml:"optionsTextColor"`
+ SelectedLineBgColor []string `yaml:"selectedLineBgColor"`
+ SelectedRangeBgColor []string `yaml:"selectedRangeBgColor"`
+ CherryPickedCommitBgColor []string `yaml:"cherryPickedCommitBgColor"`
+ CherryPickedCommitFgColor []string `yaml:"cherryPickedCommitFgColor"`
}
type CommitLengthConfig struct {
diff --git a/pkg/theme/theme.go b/pkg/theme/theme.go
index 19e4275d9..c3e12fdcc 100644
--- a/pkg/theme/theme.go
+++ b/pkg/theme/theme.go
@@ -32,7 +32,7 @@ var (
// SelectedRangeBgColor is the background color of the selected range of lines
SelectedRangeBgColor = style.New()
-
+
// CherryPickedCommitColor is the text style when cherry picking a commit
CherryPickedCommitTextStyle = style.New()
@@ -47,11 +47,11 @@ func UpdateTheme(themeConfig config.ThemeConfig) {
InactiveBorderColor = GetGocuiStyle(themeConfig.InactiveBorderColor)
SelectedLineBgColor = GetTextStyle(themeConfig.SelectedLineBgColor, true)
SelectedRangeBgColor = GetTextStyle(themeConfig.SelectedRangeBgColor, true)
-
+
cherryPickedCommitBgTextStyle := GetTextStyle(themeConfig.CherryPickedCommitBgColor, true)
cherryPickedCommitFgTextStyle := GetTextStyle(themeConfig.CherryPickedCommitFgColor, false)
CherryPickedCommitTextStyle = cherryPickedCommitBgTextStyle.MergeStyle(cherryPickedCommitFgTextStyle)
-
+
GocuiSelectedLineBgColor = GetGocuiStyle(themeConfig.SelectedLineBgColor)
OptionsColor = GetGocuiStyle(themeConfig.OptionsTextColor)
OptionsFgColor = GetTextStyle(themeConfig.OptionsTextColor, false)