Skip to content

Commit 5b3552b

Browse files
committed
fix: move background colors to theme
1 parent 12152af commit 5b3552b

2 files changed

Lines changed: 37 additions & 24 deletions

File tree

table.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,11 @@ func printTable(title string, m []Mount, opts TableOptions) {
406406
var bgColor termenv.Color
407407
switch {
408408
case usage >= redUsage:
409-
bgColor = env.Color("#2d1b1b") // dark red background
409+
bgColor = theme.colorBgRed
410410
case usage >= yellowUsage:
411-
bgColor = env.Color("#2d2d1b") // dark yellow background
411+
bgColor = theme.colorBgYellow
412412
default:
413-
bgColor = env.Color("#1b2d1b") // dark green background
413+
bgColor = theme.colorBgGreen
414414
}
415415
filledPart = filledPart.Background(bgColor).Foreground(fgColor)
416416
// Use a neutral background for empty areas

themes.go

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ type Theme struct {
1515
colorGray termenv.Color
1616
colorMagenta termenv.Color
1717
colorCyan termenv.Color
18+
19+
colorBgRed termenv.Color
20+
colorBgYellow termenv.Color
21+
colorBgGreen termenv.Color
1822
}
1923

2024
func defaultThemeName() string {
@@ -28,33 +32,42 @@ func loadTheme(theme string) (Theme, error) {
2832
themes := make(map[string]Theme)
2933

3034
themes["dark"] = Theme{
31-
colorRed: env.Color("#E88388"),
32-
colorYellow: env.Color("#DBAB79"),
33-
colorGreen: env.Color("#A8CC8C"),
34-
colorBlue: env.Color("#71BEF2"),
35-
colorGray: env.Color("#B9BFCA"),
36-
colorMagenta: env.Color("#D290E4"),
37-
colorCyan: env.Color("#66C2CD"),
35+
colorRed: env.Color("#E88388"),
36+
colorYellow: env.Color("#DBAB79"),
37+
colorGreen: env.Color("#A8CC8C"),
38+
colorBlue: env.Color("#71BEF2"),
39+
colorGray: env.Color("#B9BFCA"),
40+
colorMagenta: env.Color("#D290E4"),
41+
colorCyan: env.Color("#66C2CD"),
42+
colorBgRed: env.Color("#2d1b1b"),
43+
colorBgYellow: env.Color("#2d2d1b"),
44+
colorBgGreen: env.Color("#1b2d1b"),
3845
}
3946

4047
themes["light"] = Theme{
41-
colorRed: env.Color("#D70000"),
42-
colorYellow: env.Color("#FFAF00"),
43-
colorGreen: env.Color("#005F00"),
44-
colorBlue: env.Color("#000087"),
45-
colorGray: env.Color("#303030"),
46-
colorMagenta: env.Color("#AF00FF"),
47-
colorCyan: env.Color("#0087FF"),
48+
colorRed: env.Color("#D70000"),
49+
colorYellow: env.Color("#FFAF00"),
50+
colorGreen: env.Color("#005F00"),
51+
colorBlue: env.Color("#000087"),
52+
colorGray: env.Color("#303030"),
53+
colorMagenta: env.Color("#AF00FF"),
54+
colorCyan: env.Color("#0087FF"),
55+
colorBgRed: env.Color("#ffdede"),
56+
colorBgYellow: env.Color("#fff4d0"),
57+
colorBgGreen: env.Color("#e6ffe6"),
4858
}
4959

5060
themes["ansi"] = Theme{
51-
colorRed: env.Color("9"),
52-
colorYellow: env.Color("11"),
53-
colorGreen: env.Color("10"),
54-
colorBlue: env.Color("12"),
55-
colorGray: env.Color("7"),
56-
colorMagenta: env.Color("13"),
57-
colorCyan: env.Color("8"),
61+
colorRed: env.Color("9"),
62+
colorYellow: env.Color("11"),
63+
colorGreen: env.Color("10"),
64+
colorBlue: env.Color("12"),
65+
colorGray: env.Color("7"),
66+
colorMagenta: env.Color("13"),
67+
colorCyan: env.Color("8"),
68+
colorBgRed: env.Color("1"),
69+
colorBgYellow: env.Color("3"),
70+
colorBgGreen: env.Color("2"),
5871
}
5972

6073
if _, ok := themes[theme]; !ok {

0 commit comments

Comments
 (0)