Skip to content

Commit dbaebf8

Browse files
mritdmritd
committed
feat(ui): color
use AdaptiveColor to support white terminal Signed-off-by: mritd <[email protected]>
1 parent 26fe12c commit dbaebf8

File tree

9 files changed

+47
-50
lines changed

9 files changed

+47
-50
lines changed

‎ui/multi_task.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ var (
1616

1717
MultiTaskBorderStyle = lipgloss.NewStyle().
1818
Border(lipgloss.RoundedBorder()).
19-
BorderForeground(lipgloss.Color("#37B9FF")).
19+
BorderForeground(lipgloss.AdaptiveColor{Light: "#2B53AF", Dark: "#37B9FF"}).
2020
Width(55).
2121
Padding(0, 1, 1, 2)
2222

2323
MultiTaskMsgSuccessStyle = lipgloss.NewStyle().
2424
Bold(true).
25-
Foreground(lipgloss.Color("#2AFFA3"))
25+
Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#2AFFA3"})
2626

2727
MultiTaskMsgFailedStyle = MultiTaskMsgSuccessStyle.Copy().
28-
Foreground(lipgloss.Color("#EE6FF8"))
28+
Foreground(lipgloss.AdaptiveColor{Light: "#E11C9C", Dark: "#EE6FF8"})
2929

3030
MultiTaskMsgWaitingStyle = MultiTaskMsgSuccessStyle.Copy().
31-
Foreground(lipgloss.Color("#37B9FF"))
31+
Foreground(lipgloss.AdaptiveColor{Light: "#2B53AF", Dark: "#37B9FF"})
3232

3333
MultiTaskSpinner = spinner.Model{
34-
Style: lipgloss.NewStyle().Foreground(lipgloss.Color("#F8CA61")),
34+
Style: lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#FF9A0D", Dark: "#F8CA61"}),
3535
Spinner: spinner.Spinner{
3636
Frames: []string{
3737
"[ ]",

‎ui/single_task.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ var (
1717

1818
SingleTaskSuccessStyle = lipgloss.NewStyle().
1919
Bold(true).
20-
Foreground(lipgloss.Color("#2AFFA3"))
20+
Foreground(lipgloss.AdaptiveColor{Light: "#1C9518", Dark: "#2AFFA3"})
2121

2222
SingleTaskFailedStyle = SingleTaskSuccessStyle.Copy().
23-
Background(lipgloss.Color("#EE6FF8"))
23+
Background(lipgloss.AdaptiveColor{Light: "#E11C9C", Dark: "#EE6FF8"})
2424

2525
SingleTaskWaitingStyle = SingleTaskSuccessStyle.Copy().
26-
Foreground(lipgloss.Color("#37B9FF"))
26+
Foreground(lipgloss.AdaptiveColor{Light: "#2B53AF", Dark: "#37B9FF"})
2727

2828
SingleTaskSpinner = spinner.Model{
29-
Style: lipgloss.NewStyle().Foreground(lipgloss.Color("#EE6FF8")),
29+
Style: lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#E11C9C", Dark: "#EE6FF8"}),
3030
Spinner: spinner.Spinner{
3131
Frames: []string{
3232
"[∙∙∙]",

‎ui_commit_committing.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@ var (
1414

1515
committingTypeStyle = lipgloss.NewStyle().
1616
Bold(true).
17-
Foreground(lipgloss.Color("#FFFDF5")).
18-
Background(lipgloss.Color("#7653FF"))
17+
Foreground(lipgloss.AdaptiveColor{Light: "#FFFDF5", Dark: "#FFFDF5"}).
18+
Background(lipgloss.AdaptiveColor{Light: "#5B44FF", Dark: "#7653FF"})
1919

2020
committingScopeStyle = lipgloss.NewStyle().
2121
Bold(true).
22-
Foreground(lipgloss.Color("#FFFDF5")).
23-
Background(lipgloss.Color("#2AD67F"))
22+
Foreground(lipgloss.AdaptiveColor{Light: "#FFFDF5", Dark: "#FFFDF5"}).
23+
Background(lipgloss.AdaptiveColor{Light: "#1FD314", Dark: "#2AD67F"})
2424

2525
committingSubjectStyle = lipgloss.NewStyle().
2626
Bold(true).
27-
Foreground(lipgloss.Color("#FFFDF5")).
28-
Background(lipgloss.Color("#EE6FF8"))
27+
Foreground(lipgloss.AdaptiveColor{Light: "#FFFDF5", Dark: "#FFFDF5"}).
28+
Background(lipgloss.AdaptiveColor{Light: "#E11C9C", Dark: "#EE6FF8"})
2929

3030
committingBodyStyle = lipgloss.NewStyle().
3131
Bold(true).
32-
Foreground(lipgloss.Color("#2AD67F"))
32+
Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#2AD67F"})
3333

3434
committingFooterStyle = lipgloss.NewStyle().
3535
Bold(true).
36-
Foreground(lipgloss.Color("#2AD67F"))
36+
Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#2AD67F"})
3737

3838
committingSuccessStyle = lipgloss.NewStyle().
3939
Bold(true).
40-
Foreground(lipgloss.Color("#19F896"))
40+
Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#2AD67F"})
4141

4242
committingFailedStyle = lipgloss.NewStyle().
4343
Bold(true).
44-
Foreground(lipgloss.Color("#D63B3A"))
44+
Foreground(lipgloss.AdaptiveColor{Light: "#D63B3A", Dark: "#D63B3A"})
4545
)
4646

4747
type committingModel struct {
@@ -76,7 +76,7 @@ func newCommittingModel() committingModel {
7676
},
7777
FPS: time.Second / 15,
7878
}
79-
s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("#19F896")).Bold(true)
79+
s.Style = lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#19F896"}).Bold(true)
8080
return committingModel{spinner: s}
8181
}
8282

‎ui_commit_error.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ var (
1212
errorStyle = lipgloss.NewStyle().
1313
Bold(true).
1414
Width(64).
15-
Foreground(lipgloss.Color("#FF62DA")).
15+
Foreground(lipgloss.AdaptiveColor{Light: "#E11C9C", Dark: "#FF62DA"}).
1616
Border(lipgloss.RoundedBorder()).
17-
BorderForeground(lipgloss.Color("#FF62DA")).
17+
BorderForeground(lipgloss.AdaptiveColor{Light: "#E11C9C", Dark: "#FF62DA"}).
1818
Padding(1, 3, 1, 3)
1919
)
2020

‎ui_commit_inputs.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ var (
1717
Padding(1, 0, 1, 2)
1818

1919
inputsTitleStyle = lipgloss.NewStyle().
20-
Foreground(lipgloss.Color("#FFFDF5")).
21-
Background(lipgloss.Color("#7653FF")).
20+
Foreground(lipgloss.AdaptiveColor{Light: "#333333", Dark: "#DDDDDD"}).
21+
Background(lipgloss.AdaptiveColor{Light: "#7653FF", Dark: "#7653FF"}).
2222
Bold(true).
2323
Padding(0, 1, 0, 1)
2424

2525
inputsBlockLayout = lipgloss.NewStyle().
2626
Padding(0, 0, 1, 0)
2727

2828
inputsCursorStyle = lipgloss.NewStyle().
29-
Foreground(lipgloss.Color("#25A065"))
29+
Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#25A065"})
3030

3131
inputsPromptFocusStyle = lipgloss.NewStyle().
3232
Border(lipgloss.NormalBorder(), false, false, false, true).
33-
BorderForeground(lipgloss.AdaptiveColor{Light: "#F793FF", Dark: "#AD58B4"}).
34-
Foreground(lipgloss.AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"}).
33+
BorderForeground(lipgloss.AdaptiveColor{Light: "#9F72FF", Dark: "#AD58B4"}).
34+
Foreground(lipgloss.AdaptiveColor{Light: "#9A4AFF", Dark: "#EE6FF8"}).
3535
Bold(true).
3636
Padding(0, 0, 0, 1)
3737

@@ -43,14 +43,14 @@ var (
4343
Bold(true)
4444

4545
inputsTextNormalStyle = lipgloss.NewStyle().
46-
Foreground(lipgloss.AdaptiveColor{Light: "#313131", Dark: "#DDDDDD"})
46+
Foreground(lipgloss.AdaptiveColor{Light: "#1A1A1A", Dark: "#FFFDF5"})
4747

4848
inputsButtonLayout = lipgloss.NewStyle().
4949
Padding(2, 0, 1, 2)
5050

5151
inputsButtonFocusStyle = lipgloss.NewStyle().
52-
Foreground(lipgloss.Color("#FFFDF5")).
53-
Background(lipgloss.Color("#25A065")).
52+
Foreground(lipgloss.AdaptiveColor{Light: "#FFFDF5", Dark: "#FFFDF5"}).
53+
Background(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#25A065"}).
5454
Padding(0, 1, 0, 1).
5555
Bold(true)
5656

‎ui_commit_selector.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
var (
1414
selectorTitleStyle = lipgloss.NewStyle().
15-
Foreground(lipgloss.Color("#FFFDF5")).
16-
Background(lipgloss.Color("#25A065")).
15+
Foreground(lipgloss.AdaptiveColor{Light: "#2E2E2E", Dark: "#DDDDDD"}).
16+
Background(lipgloss.AdaptiveColor{Light: "#19A04B", Dark: "#25A065"}).
1717
Bold(true).
1818
Padding(0, 1)
1919

@@ -23,17 +23,14 @@ var (
2323

2424
selectorSelectedStyle = lipgloss.NewStyle().
2525
Border(lipgloss.NormalBorder(), false, false, false, true).
26-
BorderForeground(lipgloss.AdaptiveColor{Light: "#F793FF", Dark: "#AD58B4"}).
27-
Foreground(lipgloss.AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"}).
26+
BorderForeground(lipgloss.AdaptiveColor{Light: "#9F72FF", Dark: "#AD58B4"}).
27+
Foreground(lipgloss.AdaptiveColor{Light: "#9A4AFF", Dark: "#EE6FF8"}).
2828
Bold(true).
2929
Padding(0, 0, 0, 1)
3030

3131
selectorPaginationStyle = list.DefaultStyles().PaginationStyle.PaddingLeft(4)
3232

33-
selectorHelpStyle = lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{
34-
Light: "#DDDADA",
35-
Dark: "#7A7A7A",
36-
})
33+
selectorHelpStyle = lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#6F6C6C", Dark: "#7A7A7A"})
3734
)
3835

3936
type selectorItem struct {

‎ui_new_branch.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ var (
1313

1414
newBranchSuccessTextStyle = lipgloss.NewStyle().
1515
Bold(true).
16-
Foreground(lipgloss.Color("#2AD67F"))
16+
Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#2AD67F"})
1717

1818
newBranchSuccessNameStyle = lipgloss.NewStyle().
1919
Bold(true).
20-
Foreground(lipgloss.Color("#FFFDF5")).
21-
Background(lipgloss.Color("#7653FF"))
20+
Foreground(lipgloss.AdaptiveColor{Light: "#1A1A1A", Dark: "#FFFDF5"}).
21+
Background(lipgloss.AdaptiveColor{Light: "#5B44FF", Dark: "#7653FF"})
2222

2323
newBranchFailedTextStyle = lipgloss.NewStyle().
2424
Bold(true).
25-
Foreground(lipgloss.Color("#D63B3A"))
25+
Foreground(lipgloss.AdaptiveColor{Light: "#D63B3A", Dark: "#D63B3A"})
2626

2727
newBranchFailedErrStyle = lipgloss.NewStyle().
2828
Bold(true).
29-
Foreground(lipgloss.Color("#FFFDF5")).
30-
Background(lipgloss.Color("#D63B3A"))
29+
Foreground(lipgloss.AdaptiveColor{Light: "#1A1A1A", Dark: "#FFFDF5"}).
30+
Background(lipgloss.AdaptiveColor{Light: "#D63B3A", Dark: "#D63B3A"})
3131
)
3232

3333
type branchModel struct {

‎ui_push.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ var (
1414

1515
pushSuccessTextStyle = lipgloss.NewStyle().
1616
Bold(true).
17-
Foreground(lipgloss.Color("#57FFBA"))
17+
Foreground(lipgloss.AdaptiveColor{Light: "#25BD7E", Dark: "#57FFBA"})
1818

1919
pushSuccessMsgStyle = lipgloss.NewStyle().
2020
Bold(true).
2121
Width(75).
22-
Foreground(lipgloss.Color("#2FD0FF"))
22+
Foreground(lipgloss.AdaptiveColor{Light: "#2BAAD5", Dark: "#2FD0FF"})
2323

2424
pushFailedTextStyle = lipgloss.NewStyle().
2525
Bold(true).
26-
Foreground(lipgloss.Color("#D63B3A"))
26+
Foreground(lipgloss.AdaptiveColor{Light: "#5B44FF", Dark: "#7653FF"})
2727

2828
pushFailedErrStyle = lipgloss.NewStyle().
2929
Bold(true).
30-
Foreground(lipgloss.Color("#FF6037"))
30+
Foreground(lipgloss.AdaptiveColor{Light: "#FF2117", Dark: "#FF6037"})
3131
)
3232

3333
type pushModel struct {
@@ -68,7 +68,7 @@ func newPushModel() pushModel {
6868
},
6969
FPS: time.Second / 15,
7070
}
71-
s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("#19F896")).Bold(true)
71+
s.Style = lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#25A065", Dark: "#19F896"}).Bold(true)
7272
return pushModel{
7373
spinner: s,
7474
}

‎version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.1.0
1+
v2.1.1

0 commit comments

Comments
 (0)