summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Burke <rich.g.burke@gmail.com>2019-02-03 14:50:05 +0000
committerRichard Burke <rich.g.burke@gmail.com>2019-02-03 14:50:05 +0000
commitabfdbd1ff6456e08f371c21842ff59ab1fe92482 (patch)
treed6da8077ca581d6d7638b1d8a18a57925e446863
parent0758c64604a8a0803dd23a1f2b0b70db8804a32d (diff)
Remove cold theme
-rw-r--r--cmd/grv/config.go2
-rw-r--r--cmd/grv/config_command_help.go3
-rw-r--r--cmd/grv/themes.go421
-rw-r--r--cmd/grv/themes_test.go1
-rw-r--r--doc/documentation.md3
5 files changed, 2 insertions, 428 deletions
diff --git a/cmd/grv/config.go b/cmd/grv/config.go
index 1fbed37..b615333 100644
--- a/cmd/grv/config.go
+++ b/cmd/grv/config.go
@@ -23,7 +23,6 @@ const (
cfTabWidthMinValue = 1
cfTabWidthDefaultValue = 8
cfClassicThemeName = "classic"
- cfColdThemeName = "cold"
cfSolarizedThemeName = "solarized"
cfMouseDefaultValue = false
cfMouseScrollRowsDefaultValue = 3
@@ -335,7 +334,6 @@ func NewConfiguration(keyBindings KeyBindings, channels Channels, variables GRVV
customCommands: map[string]string{},
themes: map[string]MutableTheme{
cfClassicThemeName: NewClassicTheme(),
- cfColdThemeName: NewColdTheme(),
cfSolarizedThemeName: NewSolarizedTheme(),
},
}
diff --git a/cmd/grv/config_command_help.go b/cmd/grv/config_command_help.go
index 0a79a7a..9d7034c 100644
--- a/cmd/grv/config_command_help.go
+++ b/cmd/grv/config_command_help.go
@@ -23,10 +23,9 @@ func GenerateSetCommandHelpSections(config Config) (helpSections []*HelpSection)
{},
{text: " - solarized"},
{text: " - classic"},
- {text: " - cold"},
{},
{text: "The solarized theme is the default theme for GRV and does not respect the terminals colour palette."},
- {text: "The classic and cold themes do respect the terminals colour palette."},
+ {text: "The classic theme respects the terminals colour palette."},
}
return []*HelpSection{
diff --git a/cmd/grv/themes.go b/cmd/grv/themes.go
index 11e1200..5899795 100644
--- a/cmd/grv/themes.go
+++ b/cmd/grv/themes.go
@@ -421,427 +421,6 @@ func NewClassicTheme() MutableTheme {
}
}
-// NewColdTheme creates the cold theme of grv
-func NewColdTheme() MutableTheme {
- return &ThemeComponents{
- components: map[ThemeComponentID]*ThemeComponent{
- CmpAllviewDefault: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpAllviewSearchMatch: {
- bgcolor: NewSystemColor(ColorYellow),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpAllviewActiveViewSelectedRow: {
- bgcolor: NewSystemColor(ColorWhite),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpAllviewInactiveViewSelectedRow: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpMainviewActiveView: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpMainviewNormalView: {
- bgcolor: NewSystemColor(ColorCyan),
- fgcolor: NewSystemColor(ColorWhite),
- },
- CmpCommitviewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommitviewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommitviewShortOid: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpCommitviewDate: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpCommitviewAuthor: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpCommitviewSummary: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpCommitviewTag: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpCommitviewLocalBranch: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpCommitviewRemoteBranch: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpCommitviewGraphCommit: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommitviewGraphMergeCommit: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommitviewGraphBranch1: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorYellow),
- },
- CmpCommitviewGraphBranch2: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpCommitviewGraphBranch3: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpCommitviewGraphBranch4: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpCommitviewGraphBranch5: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpCommitviewGraphBranch6: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommitviewGraphBranch7: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorWhite),
- },
- CmpDiffviewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpDiffviewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpDiffviewDifflineNormal: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpDiffviewDifflineDiffCommitAuthor: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpDiffviewDifflineDiffCommitAuthorDate: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpDiffviewDifflineDiffCommitCommitter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpDiffviewDifflineDiffCommitCommitterDate: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpDiffviewDifflineDiffCommitMessage: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpDiffviewDifflineDiffStatsFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpDiffviewDifflineGitDiffHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpDiffviewDifflineGitDiffExtendedHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpDiffviewDifflineUnifiedDiffHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpDiffviewDifflineHunkStart: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpDiffviewDifflineHunkHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpDiffviewDifflineLineAdded: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpDiffviewDifflineLineRemoved: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpRefviewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpRefviewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpRefviewLocalBranchesHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpRefviewRemoteBranchesHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpRefviewLocalBranch: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpRefviewHead: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpRefviewRemoteBranch: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpRefviewTagsHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpRefviewTag: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpStatusbarviewNormal: {
- bgcolor: NewSystemColor(ColorCyan),
- fgcolor: NewSystemColor(ColorWhite),
- },
- CmpHelpbarviewSpecial: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpHelpbarviewNormal: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpErrorViewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpErrorViewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpErrorViewErrors: {
- bgcolor: NewSystemColor(ColorRed),
- fgcolor: NewSystemColor(ColorWhite),
- },
- CmpGitStatusMessage: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorYellow),
- },
- CmpGitStatusStagedTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpGitStatusUnstagedTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpGitStatusUntrackedTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpGitStatusConflictedTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpGitStatusStagedFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpGitStatusUnstagedFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpGitStatusUntrackedFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpGitStatusConflictedFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpContextMenuTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpContextMenuContent: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpContextMenuFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommandOutputTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpCommandOutputCommand: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorYellow),
- },
- CmpCommandOutputNormal: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpCommandOutputError: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpCommandOutputSuccess: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpCommandOutputFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpHelpViewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpHelpViewIndexTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- style: ThemeStyle{styleTypes: TstBold | TstUnderline},
- },
- CmpHelpViewIndexSubTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpHelpViewSectionTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- style: ThemeStyle{styleTypes: TstBold | TstUnderline},
- },
- CmpHelpViewSectionSubTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- style: ThemeStyle{styleTypes: TstUnderline},
- },
- CmpHelpViewSectionDescription: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpHelpViewSectionCodeBlock: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpHelpViewSectionTableHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpHelpViewSectionTableRow: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpHelpViewSectionTableRowHighlighted: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorYellow),
- style: ThemeStyle{styleTypes: TstBold},
- },
- CmpHelpViewSectionTableCellSeparator: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpHelpViewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpMessageBoxTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpMessageBoxContent: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpMessageBoxSelectedButton: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- style: ThemeStyle{styleTypes: TstUnderline | TstBold | TstReverse},
- },
- CmpGRVVariableViewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpGRVVariableViewVariable: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpGRVVariableViewValue: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpGRVVariableViewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpRemoteViewTitle: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpRemoteViewRemote: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- CmpRemoteViewFooter: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorCyan),
- },
- CmpSummaryViewHeader: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorMagenta),
- },
- CmpSummaryViewNormal: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorNone),
- },
- CmpSummaryViewBranchAhead: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpSummaryViewBranchBehind: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpSummaryViewStagedFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorGreen),
- },
- CmpSummaryViewUnstagedFile: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorRed),
- },
- CmpSummaryViewNoModifiedFiles: {
- bgcolor: NewSystemColor(ColorNone),
- fgcolor: NewSystemColor(ColorBlue),
- },
- },
- }
-}
-
const (
solarizedBrightBlack = 234
solarizedBlack = 235
diff --git a/cmd/grv/themes_test.go b/cmd/grv/themes_test.go
index f0ff457..6f5a277 100644
--- a/cmd/grv/themes_test.go
+++ b/cmd/grv/themes_test.go
@@ -20,5 +20,4 @@ func testThemeHasAllThemeComponentsSet(themeName string, theme Theme, t *testing
func TestThemesHaveAllThemeComponentsSet(t *testing.T) {
testThemeHasAllThemeComponentsSet("solarized", NewSolarizedTheme(), t)
testThemeHasAllThemeComponentsSet("classic", NewClassicTheme(), t)
- testThemeHasAllThemeComponentsSet("cold", NewColdTheme(), t)
}
diff --git a/doc/documentation.md b/doc/documentation.md
index 5db9394..e4fb6e4 100644
--- a/doc/documentation.md
+++ b/doc/documentation.md
@@ -469,10 +469,9 @@ GRV currently has the following themes available:
- solarized
- classic
- - cold
The solarized theme is the default theme for GRV and does not respect the terminals colour palette.
-The classic and cold themes do respect the terminals colour palette.
+The classic theme respects the terminals colour palette.
### sleep