add common status colors to global theme

This commit is contained in:
Bradley Cicenas 2017-08-27 23:46:01 +00:00
parent a1ebf3f90e
commit add44c0f18
4 changed files with 15 additions and 12 deletions

View File

@ -45,6 +45,9 @@ var ColorMap = map[string]ui.Attribute{
"par.text.hi": ui.ColorBlack, "par.text.hi": ui.ColorBlack,
"sparkline.line.fg": ui.ColorGreen, "sparkline.line.fg": ui.ColorGreen,
"sparkline.title.fg": ui.ColorWhite, "sparkline.title.fg": ui.ColorWhite,
"status.ok": ui.ColorGreen,
"status.warn": ui.ColorYellow,
"status.danger": ui.ColorRed,
} }
func InvertColorMap() { func InvertColorMap() {

View File

@ -25,10 +25,10 @@ func (w *GaugeCol) Reset() {
func colorScale(n int) ui.Attribute { func colorScale(n int) ui.Attribute {
if n > 70 { if n > 70 {
return ui.ColorRed return ui.ThemeAttr("status.danger")
} }
if n > 30 { if n > 30 {
return ui.ColorYellow return ui.ThemeAttr("status.warn")
} }
return ui.ColorGreen return ui.ThemeAttr("status.ok")
} }

View File

@ -32,9 +32,9 @@ func (s *Status) Set(val string) {
switch val { switch val {
case "running": case "running":
color = ui.ColorGreen color = ui.ThemeAttr("status.ok")
case "exited": case "exited":
color = ui.ColorRed color = ui.ThemeAttr("status.danger")
case "paused": case "paused":
text = fmt.Sprintf("%s%s", vBar, vBar) text = fmt.Sprintf("%s%s", vBar, vBar)
} }

View File

@ -18,7 +18,7 @@ func NewTextCol(s string) *TextCol {
} }
func (w *TextCol) Highlight() { func (w *TextCol) Highlight() {
if w.TextFgColor ==ui.ThemeAttr("par.text.fg"){ if w.TextFgColor == ui.ThemeAttr("par.text.fg") {
w.TextFgColor = ui.ThemeAttr("par.text.hi") w.TextFgColor = ui.ThemeAttr("par.text.hi")
} }
w.TextBgColor = ui.ThemeAttr("par.text.fg") w.TextBgColor = ui.ThemeAttr("par.text.fg")
@ -26,7 +26,7 @@ func (w *TextCol) Highlight() {
} }
func (w *TextCol) UnHighlight() { func (w *TextCol) UnHighlight() {
if w.TextFgColor == ui.ThemeAttr("par.text.hi"){ if w.TextFgColor == ui.ThemeAttr("par.text.hi") {
w.TextFgColor = ui.ThemeAttr("par.text.fg") w.TextFgColor = ui.ThemeAttr("par.text.fg")
} }
w.TextBgColor = ui.ThemeAttr("par.text.bg") w.TextBgColor = ui.ThemeAttr("par.text.bg")
@ -41,18 +41,18 @@ func (w *TextCol) Set(s string) {
w.Text = s w.Text = s
} }
func (w *TextCol) Color(s string){ func (w *TextCol) Color(s string) {
color := ui.ThemeAttr("par.text.fg") color := ui.ThemeAttr("par.text.fg")
if w.isHighlight{ if w.isHighlight {
color = ui.ThemeAttr("par.text.hi") color = ui.ThemeAttr("par.text.hi")
} }
switch s { switch s {
case "healthy": case "healthy":
color = ui.ColorGreen color = ui.ThemeAttr("status.ok")
case "unhealthy": case "unhealthy":
color = ui.ColorMagenta color = ui.ThemeAttr("status.danger")
case "starting": case "starting":
color = ui.ColorYellow color = ui.ThemeAttr("status.warn")
} }
w.TextFgColor = color w.TextFgColor = color
} }