Mirrors/glow
2
0
Fork 0
mirror of https://github.com/charmbracelet/glow synced 2025-03-04 14:57:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust "secondary" green color in stash highlight + help

Browse source
This commit is contained in:
Christian Rocha 2020-12-17 18:31:08 -05:00
parent 379dc74d0e
commit dd936ac1cd
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/stashhelp.go
View file

@ -46,7 +46,7 @@ func (h helpColumn) render(height int) (rows []string) {
switch k {
case "s":
k = greenFg(k)
v = dimGreenFg(v)
v = semiDimGreenFg(v)
default:
k = grayFg(k)
v = midGrayFg(v)
@ -216,7 +216,7 @@ func (m stashModel) miniHelpView(entries ...string) string {
switch k {
case "s":
k = greenFg(k)
v = dimGreenFg(v)
v = semiDimGreenFg(v)
default:
k = grayFg(k)
v = midGrayFg(v)

20
ui/stashitem.go
View file

@ -46,13 +46,11 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
isSelected := index == m.cursor()
isFiltering := m.filterState == filtering
singleFilteredItem := isFiltering && len(m.getVisibleMarkdowns()) == 1
// If there are multiple items being filtered we don't highlight a selected
// If there are multiple items being filtered don't highlight a selected
// item in the results. If we've filtered down to one item, however,
// highlight that first item since pressing return will open it.
singleFilteredItem :=
isFiltering && len(m.getVisibleMarkdowns()) == 1
if isSelected && !isFiltering || singleFilteredItem {
// Selected item
@ -73,11 +71,12 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
gutter = greenFg(verticalLine)
icon = dimGreenFg(icon)
title = greenFg(title)
date = dimGreenFg(date)
date = semiDimGreenFg(date)
} else {
gutter = dullFuchsiaFg(verticalLine)
icon = dullFuchsiaFg(icon)
if m.currentSection().key == filterSection && m.filterState == filterApplied || singleFilteredItem {
if m.currentSection().key == filterSection &&
m.filterState == filterApplied || singleFilteredItem {
s := termenv.Style{}.Foreground(lib.Fuschia.Color())
title = styleFilteredText(title, m.filterInput.Value(), s, s.Underline())
} else {
@ -89,15 +88,14 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
} else {
// Regular (non-selected) items
gutter = " "
if m.common.latestFileStashed == md.stashID &&
m.statusMessage == stashedStatusMessage {
gutter = " "
icon = dimGreenFg(icon)
title = greenFg(title)
date = dimGreenFg(date)
date = semiDimGreenFg(date)
} else if md.docType == NewsDoc {
gutter = " "
if isFiltering && m.filterInput.Value() == "" {
title = dimIndigoFg(title)
date = dimSubtleIndigoFg(date)
@ -113,7 +111,6 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
} else {
title = dimNormalFg(title)
}
gutter = " "
date = dimBrightGrayFg(date)
} else {
icon = greenFg(icon)
@ -123,7 +120,6 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
s := termenv.Style{}.Foreground(lib.NewColorPair("#dddddd", "#1a1a1a").Color())
title = styleFilteredText(title, m.filterInput.Value(), s, s.Underline())
}
gutter = " "
date = brightGrayFg(date)
}
}

5
ui/styles.go
View file

@ -22,8 +22,9 @@ var (
midGrayFg = newFgStyle(lib.NewColorPair("#4A4A4A", "#B2B2B2"))
darkGrayFg = newFgStyle(lib.NewColorPair("#3C3C3C", "#DDDADA"))
greenFg = newFgStyle(lib.NewColorPair("#04B575", "#04B575"))
dimGreenFg = newFgStyle(lib.NewColorPair("#0B5137", "#72D2B0"))
greenFg = newFgStyle(lib.NewColorPair("#04B575", "#04B575"))
semiDimGreenFg = newFgStyle(lib.NewColorPair("#036B46", "#35D79C"))
dimGreenFg = newFgStyle(lib.NewColorPair("#0B5137", "#72D2B0"))
fuchsiaFg = newFgStyle(lib.Fuschia)
dimFuchsiaFg = newFgStyle(lib.NewColorPair("#99519E", "#F1A8FF"))