summaryrefslogtreecommitdiffstats
path: root/pkg/commands
diff options
context:
space:
mode:
authormjarkk <mkopenga@gmail.com>2019-10-18 09:48:37 +0200
committerJesse Duffield <jessedduffield@gmail.com>2019-10-20 12:32:57 +1100
commit02fef3136f27a0a93352ee62f47d4924e54389dd (patch)
tree1be96988ffda2cc6f29c1d06ebf60d8677c5121c /pkg/commands
parent8fe0e00cd9484c231c79c77ad3bc3dd601f0451a (diff)
Added light theme option to the settings
Diffstat (limited to 'pkg/commands')
-rw-r--r--pkg/commands/branch.go4
-rw-r--r--pkg/commands/commit.go7
2 files changed, 7 insertions, 4 deletions
diff --git a/pkg/commands/branch.go b/pkg/commands/branch.go
index cbcab2712..d1cafdfb4 100644
--- a/pkg/commands/branch.go
+++ b/pkg/commands/branch.go
@@ -4,6 +4,8 @@ import (
"fmt"
"strings"
+ "github.com/jesseduffield/lazygit/pkg/theme"
+
"github.com/fatih/color"
"github.com/jesseduffield/lazygit/pkg/utils"
)
@@ -38,7 +40,7 @@ func (b *Branch) GetColor() color.Attribute {
case "hotfix":
return color.FgRed
default:
- return color.FgWhite
+ return theme.DefaultTextColor
}
}
diff --git a/pkg/commands/commit.go b/pkg/commands/commit.go
index e8a0a52e7..4102af4c0 100644
--- a/pkg/commands/commit.go
+++ b/pkg/commands/commit.go
@@ -2,6 +2,7 @@ package commands
import (
"github.com/fatih/color"
+ "github.com/jesseduffield/lazygit/pkg/theme"
"github.com/jesseduffield/lazygit/pkg/utils"
)
@@ -22,7 +23,7 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
green := color.New(color.FgGreen)
blue := color.New(color.FgBlue)
cyan := color.New(color.FgCyan)
- white := color.New(color.FgWhite)
+ defaultColor := color.New(theme.DefaultTextColor)
magenta := color.New(color.FgMagenta)
// for some reason, setting the background to blue pads out the other commits
@@ -43,7 +44,7 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
case "selected":
shaColor = magenta
default:
- shaColor = white
+ shaColor = defaultColor
}
if c.Copied {
@@ -55,5 +56,5 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
actionString = cyan.Sprint(utils.WithPadding(c.Action, 7)) + " "
}
- return []string{shaColor.Sprint(c.Sha), actionString + white.Sprint(c.Name)}
+ return []string{shaColor.Sprint(c.Sha), actionString + defaultColor.Sprint(c.Name)}
}