From c5f7ad5adb00b73acd44a086687ffbe5d7705aa2 Mon Sep 17 00:00:00 2001 From: Sam Burville Date: Wed, 29 Sep 2021 12:53:31 +0100 Subject: 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 --- pkg/config/user_config.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkg/config') 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, -- cgit v1.2.3