diff --git a/internal/tui/bubbles/repo/bubble.go b/internal/tui/bubbles/repo/bubble.go index 63bf8853655a475e8458fa93a69032aaa575da77..e50c4cefe03de86c15419577e1caa92437cacce0 100644 --- a/internal/tui/bubbles/repo/bubble.go +++ b/internal/tui/bubbles/repo/bubble.go @@ -9,6 +9,7 @@ import ( "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/glamour" + "github.com/charmbracelet/glamour/ansi" "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/soft-serve/internal/git" "github.com/charmbracelet/soft-serve/internal/tui/style" @@ -21,6 +22,15 @@ const ( repoNameMaxWidth = 32 ) +var glamourStyle = func() ansi.StyleConfig { + noColor := "" + s := glamour.DarkStyleConfig + s.Document.StylePrimitive.Color = &noColor + s.CodeBlock.Chroma.Text.Color = &noColor + s.CodeBlock.Chroma.Name.Color = &noColor + return s +}() + type ErrMsg struct { Error error } @@ -203,7 +213,7 @@ func (b *Bubble) glamourize(md string) (string, error) { w = glamourMaxWidth } tr, err := glamour.NewTermRenderer( - glamour.WithStandardStyle("dark"), + glamour.WithStyles(glamourStyle), glamour.WithWordWrap(w), ) diff --git a/internal/tui/style/style.go b/internal/tui/style/style.go index b35a62efc36307619527f2b0769ced58d0574ea3..9377fb0e3b78256023147b396ab9adbfd20c9f69 100644 --- a/internal/tui/style/style.go +++ b/internal/tui/style/style.go @@ -65,7 +65,6 @@ func DefaultStyles() *Styles { SetString(">") s.MenuItem = lipgloss.NewStyle(). - Foreground(lipgloss.Color("252")). PaddingLeft(2) s.SelectedMenuItem = lipgloss.NewStyle(). @@ -106,8 +105,7 @@ func DefaultStyles() *Styles { } s.RepoTitle = lipgloss.NewStyle(). - Padding(0, 2). - Foreground(lipgloss.Color("252")) + Padding(0, 2) s.RepoTitleBox = lipgloss.NewStyle(). BorderStyle(s.RepoTitleBorder).