chore: change colors

DanielleMaywood · DanielleMaywood · commit 5b8fa3bda2a0 · 2024-09-13T12:48:27.000Z
diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go
@@ -43,10 +43,13 @@ var (
 )
 
 var (
-	Green  = Color("2")
-	Red    = Color("1")
-	Yellow = Color("3")
-	Blue   = Color("4")
+	Red           = Color("1")
+	Green         = Color("2")
+	Yellow        = Color("3")
+	Blue          = Color("4")
+	Magenta       = Color("5")
+	White         = Color("7")
+	BrightMagenta = Color("13")
 )
 
 // Color returns a color for the given string.
@@ -138,27 +141,30 @@ func init() {
 		Code: pretty.Style{
 			ifTerm(pretty.XPad(1, 1)),
 			pretty.FgColor(color.Color("#ED567A")),
-			pretty.BgColor(color.Color("#2c2c2c")),
+			pretty.BgColor(color.Color("#2C2C2C")),
 		},
 		DateTimeStamp: pretty.Style{
-			pretty.FgColor(color.Color("#7571F9")),
+			pretty.FgColor(Blue),
 		},
 		Error: pretty.Style{
 			pretty.FgColor(Red),
 		},
 		Field: pretty.Style{
 			pretty.XPad(1, 1),
 			pretty.FgColor(color.Color("#FFFFFF")),
-			pretty.BgColor(color.Color("#2b2a2a")),
+			pretty.BgColor(color.Color("#2B2A2A")),
+		},
+		Fuchsia: pretty.Style{
+			pretty.FgColor(BrightMagenta),
 		},
 		Keyword: pretty.Style{
 			pretty.FgColor(Green),
 		},
 		Placeholder: pretty.Style{
-			pretty.FgColor(color.Color("#4d46b3")),
+			pretty.FgColor(Magenta),
 		},
 		Prompt: pretty.Style{
-			pretty.FgColor(color.Color("#5C5C5C")),
+			pretty.FgColor(White),
 			pretty.Wrap("> ", ""),
 		},
 		Warn: pretty.Style{
diff --git a/cli/cliui/select.go b/cli/cliui/select.go
@@ -256,7 +256,7 @@ func (m selectModel) View() string {
 		if m.cursor == start+i {
 			style = pretty.Style{
 				pretty.Wrap("> ", ""),
-				pretty.FgColor(Green),
+				DefaultStyles.Keyword,
 			}
 		}
 
@@ -481,13 +481,13 @@ func (m multiSelectModel) View() string {
 		o := option.option
 
 		if m.cursor == i {
-			cursor = pretty.Sprint(pretty.FgColor(Green), "> ")
-			chosen = pretty.Sprint(pretty.FgColor(Green), "[ ]")
-			o = pretty.Sprint(pretty.FgColor(Green), o)
+			cursor = pretty.Sprint(DefaultStyles.Keyword, "> ")
+			chosen = pretty.Sprint(DefaultStyles.Keyword, "[ ]")
+			o = pretty.Sprint(DefaultStyles.Keyword, o)
 		}
 
 		if option.chosen {
-			chosen = pretty.Sprint(pretty.FgColor(Green), "[x]")
+			chosen = pretty.Sprint(DefaultStyles.Keyword, "[x]")
 		}
 
 		_, _ = s.WriteString(fmt.Sprintf(
diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go
@@ -73,7 +73,7 @@ func main() {
 			msg = pretty.Sprint(cliui.DefaultStyles.FocusedPrompt, "This is a focused prompt message")
 			_, _ = fmt.Fprintln(inv.Stdout, msg)
 
-			msg = pretty.Sprint(cliui.DefaultStyles.Fuchsia, "This is a fuchsia prompt message")
+			msg = pretty.Sprint(cliui.DefaultStyles.Fuchsia, "This is a fuchsia message")
 			_, _ = fmt.Fprintln(inv.Stdout, msg)
 
 			msg = pretty.Sprint(cliui.DefaultStyles.Warn, "This is a warning message")

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func (m selectModel) View() string {`
`256`	`256`	`if m.cursor == start+i {`
`257`	`257`	`style = pretty.Style{`
`258`	`258`	`pretty.Wrap("> ", ""),`
`259`		`- pretty.FgColor(Green),`
	`259`	`+ DefaultStyles.Keyword,`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`@@ -481,13 +481,13 @@ func (m multiSelectModel) View() string {`
`481`	`481`	`o := option.option`
`482`	`482`
`483`	`483`	`if m.cursor == i {`
`484`		`- cursor = pretty.Sprint(pretty.FgColor(Green), "> ")`
`485`		`- chosen = pretty.Sprint(pretty.FgColor(Green), "[ ]")`
`486`		`- o = pretty.Sprint(pretty.FgColor(Green), o)`
	`484`	`+ cursor = pretty.Sprint(DefaultStyles.Keyword, "> ")`
	`485`	`+ chosen = pretty.Sprint(DefaultStyles.Keyword, "[ ]")`
	`486`	`+ o = pretty.Sprint(DefaultStyles.Keyword, o)`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`if option.chosen {`
`490`		`- chosen = pretty.Sprint(pretty.FgColor(Green), "[x]")`
	`490`	`+ chosen = pretty.Sprint(DefaultStyles.Keyword, "[x]")`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`_, _ = s.WriteString(fmt.Sprintf(`