summaryrefslogtreecommitdiffstats
path: root/pkg/config
diff options
context:
space:
mode:
authorSam Burville <Sam.Burville@GlobalProcessing.com>2021-09-29 12:53:31 +0100
committerJesse Duffield <jessedduffield@gmail.com>2021-09-30 01:26:05 +1000
commitc5f7ad5adb00b73acd44a086687ffbe5d7705aa2 (patch)
tree15948daa416d8e5adaff4105241304acbb859d5b /pkg/config
parent663c036ca5c5639c772a3f37ccef50ff03979337 (diff)
Make cherry pick commit color customisable
Two new settings in the config, which allow the cherry picked foreground and background to be custom colors. Issue #856
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/user_config.go16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 7b5145a47..a1e85401d 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -44,12 +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"`
+ 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 {
@@ -319,6 +321,8 @@ func GetDefaultConfig() *UserConfig {
OptionsTextColor: []string{"blue"},
SelectedLineBgColor: []string{"default"},
SelectedRangeBgColor: []string{"blue"},
+ CherryPickedCommitBgColor: []string{"blue"},
+ CherryPickedCommitFgColor: []string{"cyan"},
},
CommitLength: CommitLengthConfig{Show: true},
SkipNoStagedFilesWarning: false,