From 115c33d94eb6fc105719fe7b8daa3aaa5e9be737 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Tue, 3 Sep 2024 04:02:39 +0000 Subject: [PATCH] try to make color more background neutral --- cmd/towncon/main.go | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/cmd/towncon/main.go b/cmd/towncon/main.go index ac56ed2..7cc91b2 100644 --- a/cmd/towncon/main.go +++ b/cmd/towncon/main.go @@ -43,7 +43,7 @@ func info() error { if err != nil { return err } - out, err := glamour.Render(string(infoContent), "dracula") + out, err := glamour.Render(string(infoContent), "auto") if err != nil { return err } @@ -131,7 +131,7 @@ func rsvp(o opts) error { huh.NewGroup( huh.NewText(). Title("Anything you want me to know? Any questions?"). - Value(&freeform))) + Value(&freeform))).WithTheme(huh.ThemeBase()) err := form.Run() if err != nil { @@ -190,7 +190,7 @@ func submit(o opts) error { if err != nil { return err } - out, err := glamour.Render(string(submitContent), "dracula") + out, err := glamour.Render(string(submitContent), "auto") if err != nil { return err } @@ -240,7 +240,7 @@ func submit(o opts) error { huh.NewGroup( huh.NewText().Title("Anything else I should know?").Value(&freeform), ).WithHideFunc(notSubmitting), - ) + ).WithTheme(huh.ThemeBase()) if err := form.Run(); err != nil { return err @@ -281,7 +281,7 @@ func jam(o opts) error { if err != nil { return err } - out, err := glamour.Render(string(jamContent), "dracula") + out, err := glamour.Render(string(jamContent), "auto") if err != nil { return err } @@ -306,7 +306,7 @@ func jam(o opts) error { huh.NewText().Title("Describe the jam."). Description("Include details like required knowledge or tools").Value(&desc), ).WithHideFunc(notSubmitting), - ) + ).WithTheme(huh.ThemeBase()) if err := form.Run(); err != nil { return err @@ -346,13 +346,6 @@ type opts struct { } func _main() error { - b, err := banner() - if err != nil { - return err - } - - fmt.Println(b) - u, err := user.Current() if err != nil { return err @@ -360,7 +353,6 @@ func _main() error { o := opts{ Username: u.Username, - Style: darkbg, } b, err := banner() @@ -368,9 +360,9 @@ func _main() error { return err } - fmt.Println(o.Style.Render(b)) + fmt.Println(b) - fmt.Print(o.Style.Render(fmt.Sprintf("\t\t^_^_^_^_^_^_^ hi ~%s ^_^_^_^_^_^_^\n", o.Username))) + fmt.Print(fmt.Sprintf("\t\t^_^_^_^_^_^_^ hi ~%s ^_^_^_^_^_^_^\n", o.Username)) fmt.Println() var mode string @@ -385,7 +377,7 @@ func _main() error { huh.NewOption("Submit or propose a work (talk, art, etc)", "submit"), huh.NewOption("Propose a creative jam", "jam"), huh.NewOption("Quit", "quit"), - ).Value(&mode))) + ).Value(&mode))).WithTheme(huh.ThemeBase()) err = form.Run() if err != nil {