git.iko.soy/crush
on main help sign in
fix(styles): fix some regressions where colors were incorrect
cfcffd2Christian Rocha
internal/ui/styles/quickstyle.go+9−9
compare with main
unifiedsplit
@@ -242,7 +242,7 @@ func quickStyle(o quickStyleOpts) Styles {
242 Color: hex(o.fgSubtle),
242 Color: hex(o.fgSubtle),
243 },
243 },
244 Error: ansi.StylePrimitive{
244 Error: ansi.StylePrimitive{
245− Color: hex(o.primary),
245+ Color: hex(o.onPrimary),
246 BackgroundColor: hex(o.error),
246 BackgroundColor: hex(o.error),
247 },
247 },
248 Comment: ansi.StylePrimitive{
248 Comment: ansi.StylePrimitive{
@@ -618,12 +618,12 @@ func quickStyle(o quickStyleOpts) Styles {
618 s.Tool.StateWaiting = base.Foreground(o.fgMostSubtle)
618 s.Tool.StateWaiting = base.Foreground(o.fgMostSubtle)
619 s.Tool.StateCancelled = base.Foreground(o.fgMostSubtle)
619 s.Tool.StateCancelled = base.Foreground(o.fgMostSubtle)
620
620
621− s.Tool.ErrorTag = base.Padding(0, 1).Background(o.destructive).Foreground(o.primary)
621+ s.Tool.ErrorTag = base.Padding(0, 1).Background(o.destructive).Foreground(o.onPrimary)
622 s.Tool.ErrorMessage = base.Foreground(o.fgSubtle)
622 s.Tool.ErrorMessage = base.Foreground(o.fgSubtle)
623
623
624 // Diff and multi-edit styles
624 // Diff and multi-edit styles
625 s.Tool.DiffTruncation = muted.Background(o.bgLeastVisible).PaddingLeft(2)
625 s.Tool.DiffTruncation = muted.Background(o.bgLeastVisible).PaddingLeft(2)
626− s.Tool.NoteTag = base.Padding(0, 1).Background(o.info).Foreground(o.primary)
626+ s.Tool.NoteTag = base.Padding(0, 1).Background(o.info).Foreground(o.onPrimary)
627 s.Tool.NoteMessage = base.Foreground(o.fgSubtle)
627 s.Tool.NoteMessage = base.Foreground(o.fgSubtle)
628
628
629 // Job header styles
629 // Job header styles
@@ -636,7 +636,7 @@ func quickStyle(o quickStyleOpts) Styles {
636 s.Tool.JobDescription = subtle
636 s.Tool.JobDescription = subtle
637
637
638 // Agent task styles
638 // Agent task styles
639− s.Tool.AgentTaskTag = base.Bold(true).Padding(0, 1).MarginLeft(2).Background(o.infoMoreSubtle).Foreground(o.primary)
639+ s.Tool.AgentTaskTag = base.Bold(true).Padding(0, 1).MarginLeft(2).Background(o.infoMoreSubtle).Foreground(o.onPrimary)
640 s.Tool.AgentPrompt = muted
640 s.Tool.AgentPrompt = muted
641
641
642 // Agentic fetch styles
642 // Agentic fetch styles
@@ -684,7 +684,7 @@ func quickStyle(o quickStyleOpts) Styles {
684 s.Tool.ResultItemDesc = lipgloss.NewStyle().Foreground(o.fgMostSubtle)
684 s.Tool.ResultItemDesc = lipgloss.NewStyle().Foreground(o.fgMostSubtle)
685
685
686 // Buttons
686 // Buttons
687− s.Button.Focused = lipgloss.NewStyle().Foreground(o.primary).Background(o.secondary)
687+ s.Button.Focused = lipgloss.NewStyle().Foreground(o.onPrimary).Background(o.secondary)
688 s.Button.Blurred = lipgloss.NewStyle().Foreground(o.fgBase).Background(o.bgLessVisible)
688 s.Button.Blurred = lipgloss.NewStyle().Foreground(o.fgBase).Background(o.bgLessVisible)
689
689
690 // Editor
690 // Editor
@@ -783,7 +783,7 @@ func quickStyle(o quickStyleOpts) Styles {
783 BorderForeground(o.successMostSubtle).BorderStyle(messageFocussedBorder)
783 BorderForeground(o.successMostSubtle).BorderStyle(messageFocussedBorder)
784 s.Messages.Thinking = lipgloss.NewStyle().MaxHeight(10)
784 s.Messages.Thinking = lipgloss.NewStyle().MaxHeight(10)
785 s.Messages.ErrorTag = lipgloss.NewStyle().Padding(0, 1).
785 s.Messages.ErrorTag = lipgloss.NewStyle().Padding(0, 1).
786− Background(o.destructive).Foreground(o.primary)
786+ Background(o.destructive).Foreground(o.onPrimary)
787 s.Messages.ErrorTitle = lipgloss.NewStyle().Foreground(o.fgSubtle)
787 s.Messages.ErrorTitle = lipgloss.NewStyle().Foreground(o.fgSubtle)
788 s.Messages.ErrorDetails = lipgloss.NewStyle().Foreground(o.fgMostSubtle)
788 s.Messages.ErrorDetails = lipgloss.NewStyle().Foreground(o.fgMostSubtle)
789
789
@@ -847,7 +847,7 @@ func quickStyle(o quickStyleOpts) Styles {
847 s.Dialog.Help.FullDesc = base.Foreground(o.fgMostSubtle)
847 s.Dialog.Help.FullDesc = base.Foreground(o.fgMostSubtle)
848 s.Dialog.Help.FullSeparator = base.Foreground(o.separator)
848 s.Dialog.Help.FullSeparator = base.Foreground(o.separator)
849 s.Dialog.NormalItem = base.Padding(0, 1).Foreground(o.fgBase)
849 s.Dialog.NormalItem = base.Padding(0, 1).Foreground(o.fgBase)
850− s.Dialog.SelectedItem = base.Padding(0, 1).Background(o.primary).Foreground(o.fgBase)
850+ s.Dialog.SelectedItem = base.Padding(0, 1).Background(o.primary).Foreground(o.onPrimary)
851 s.Dialog.InputPrompt = base.Margin(1, 1)
851 s.Dialog.InputPrompt = base.Margin(1, 1)
852
852
853 s.Dialog.List = base.Margin(0, 0, 1, 0)
853 s.Dialog.List = base.Margin(0, 0, 1, 0)
@@ -908,11 +908,11 @@ func quickStyle(o quickStyleOpts) Styles {
908 s.Status.InfoMessage = s.Status.SuccessMessage
908 s.Status.InfoMessage = s.Status.SuccessMessage
909 s.Status.UpdateMessage = s.Status.SuccessMessage
909 s.Status.UpdateMessage = s.Status.SuccessMessage
910 s.Status.WarnMessage = s.Status.SuccessMessage.Foreground(o.bgMostVisible).Background(o.warningSubtle)
910 s.Status.WarnMessage = s.Status.SuccessMessage.Foreground(o.bgMostVisible).Background(o.warningSubtle)
911− s.Status.ErrorMessage = s.Status.SuccessMessage.Foreground(o.primary).Background(o.error)
911+ s.Status.ErrorMessage = s.Status.SuccessMessage.Foreground(o.onPrimary).Background(o.error)
912
912
913 // Completions styles
913 // Completions styles
914 s.Completions.Normal = base.Background(o.bgLessVisible).Foreground(o.fgBase)
914 s.Completions.Normal = base.Background(o.bgLessVisible).Foreground(o.fgBase)
915− s.Completions.Focused = base.Background(o.primary).Foreground(o.primary)
915+ s.Completions.Focused = base.Background(o.primary).Foreground(o.onPrimary)
916 s.Completions.Match = base.Underline(true)
916 s.Completions.Match = base.Underline(true)
917
917
918 // Attachments styles
918 // Attachments styles