chore: add yellow to common colors

futurice · Sep 24, 2024 · 999479f · 999479f
1 parent a8fe7ea
commit 999479f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/ui/colors/colors.go b/pkg/ui/colors/colors.go
@@ -3,6 +3,7 @@ package colors
 import "github.com/charmbracelet/lipgloss"
 
 var (
-	Red   = lipgloss.NewStyle().Foreground(lipgloss.Color("#EF4136"))
-	Green = lipgloss.NewStyle().Foreground(lipgloss.Color("#26A568"))
+	Red    = lipgloss.NewStyle().Foreground(lipgloss.Color("#EF4136"))
+	Green  = lipgloss.NewStyle().Foreground(lipgloss.Color("#26A568"))
+	Yellow = lipgloss.NewStyle().Foreground(lipgloss.Color("#FFFF00"))
 )
diff --git a/pkg/ui/conflict/conflict.go b/pkg/ui/conflict/conflict.go
@@ -142,7 +142,7 @@ func combineDiffLinesToColorizedDiffString(lines []string) string {
 			colorizedLines = append(colorizedLines, colors.Red.Render(line))
 		}
 	}
-	colorizedLines = append(colorizedLines, lipgloss.NewStyle().Foreground(lipgloss.Color("#FFFF00")).Render("-- End of file --"))
+	colorizedLines = append(colorizedLines, colors.Yellow.Render("-- End of file --"))
 	return strings.Join(colorizedLines, "\n")
 }