Revert "ENH change color sheme"

This reverts commit bd36011119.
This commit is contained in:
Nathan Dwarshuis 2020-01-28 20:22:15 -05:00
parent 239b48c74b
commit fa0ad15c70
9 changed files with 28 additions and 27 deletions

View File

@ -36,7 +36,7 @@ local status = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = header.bottom_y, y = header.bottom_y,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<status>' text = '<status>'
} }
} }
@ -60,7 +60,7 @@ local internal_temp = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _INTERNAL_TEMP_Y_, y = _INTERNAL_TEMP_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<gpu_temp>' text = '<gpu_temp>'
} }
} }
@ -87,7 +87,7 @@ local clock_speed = {
y = _CLOCK_SPEED_Y_, y = _CLOCK_SPEED_Y_,
spacing = _TEXT_SPACING_, spacing = _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
num_rows = 2 num_rows = 2
} }
} }
@ -111,7 +111,7 @@ local gpu_util = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _GPU_UTIL_Y_, y = _GPU_UTIL_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<gpu_util>' text = '<gpu_util>'
}, },
plot = _G_Widget_.LabelPlot{ plot = _G_Widget_.LabelPlot{
@ -134,7 +134,7 @@ local mem_util = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _MEM_UTIL_Y_, y = _MEM_UTIL_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<mem_util>' text = '<mem_util>'
}, },
plot = _G_Widget_.LabelPlot{ plot = _G_Widget_.LabelPlot{
@ -157,7 +157,7 @@ local vid_util = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _VID_UTIL_Y_, y = _VID_UTIL_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<vid_util>' text = '<vid_util>'
}, },
plot = _G_Widget_.LabelPlot{ plot = _G_Widget_.LabelPlot{

View File

@ -61,7 +61,7 @@ local cache_arc = _G_Widget_.Arc{
y = DIAL_Y, y = DIAL_Y,
radius = DIAL_RADIUS, radius = DIAL_RADIUS,
thickness = _DIAL_THICKNESS_, thickness = _DIAL_THICKNESS_,
arc_pattern = _G_Patterns_.BLUE_ROUNDED arc_pattern = _G_Patterns_.PURPLE_ROUNDED
} }
local total_used = _G_Widget_.CriticalText{ local total_used = _G_Widget_.CriticalText{
@ -113,7 +113,7 @@ local cache = {
y = _LINE_1_Y_ + _TEXT_SPACING_, y = _LINE_1_Y_ + _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
append_end = ' %', append_end = ' %',
text_color = _G_Patterns_.BLUE, text_color = _G_Patterns_.PURPLE,
'<cached_kb>', '<cached_kb>',
'<buffers_kb>', '<buffers_kb>',
'<kernel_slab>' '<kernel_slab>'

View File

@ -39,7 +39,7 @@ local dnload = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = header.bottom_y, y = header.bottom_y,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE text_color = _G_Patterns_.BLUE
}, },
plot = _G_Widget_.ScalePlot{ plot = _G_Widget_.ScalePlot{
x = _G_INIT_DATA_.CENTER_RIGHT_X, x = _G_INIT_DATA_.CENTER_RIGHT_X,
@ -62,7 +62,7 @@ local upload = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _UPLOAD_Y_, y = _UPLOAD_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE text_color = _G_Patterns_.BLUE
}, },
plot = _G_Widget_.ScalePlot{ plot = _G_Widget_.ScalePlot{
x = _G_INIT_DATA_.CENTER_RIGHT_X, x = _G_INIT_DATA_.CENTER_RIGHT_X,

View File

@ -32,7 +32,7 @@ local info = _G_Widget_.TextColumn{
y = header.bottom_y, y = header.bottom_y,
spacing = _TEXT_SPACING_, spacing = _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
num_rows = 5 num_rows = 5
} }

View File

@ -41,7 +41,7 @@ local pkg0 = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = header.bottom_y, y = header.bottom_y,
x_align = 'right', x_align = 'right',
text_color = Patterns.PURPLE, text_color = Patterns.BLUE,
text = '<core>', text = '<core>',
append_end = ' W', append_end = ' W',
}, },
@ -66,7 +66,7 @@ local dram = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _CORE_Y_, y = _CORE_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<dram>', text = '<dram>',
append_end = ' W' append_end = ' W'
}, },

View File

@ -139,7 +139,7 @@ local ave_freq = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _FREQ_Y_, y = _FREQ_Y_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
text = '<freq>' text = '<freq>'
} }
} }

View File

@ -69,7 +69,7 @@ local reads = {
y = header.bottom_y, y = header.bottom_y,
x_align = 'right', x_align = 'right',
append_end=' B/s', append_end=' B/s',
text_color = _G_Patterns_.PURPLE text_color = _G_Patterns_.BLUE
}, },
plot = _G_Widget_.ScalePlot{ plot = _G_Widget_.ScalePlot{
x = _G_INIT_DATA_.CENTER_LEFT_X, x = _G_INIT_DATA_.CENTER_LEFT_X,
@ -93,7 +93,7 @@ local writes = {
y = _WRITE_Y_, y = _WRITE_Y_,
x_align = 'right', x_align = 'right',
append_end =' B/s', append_end =' B/s',
text_color = _G_Patterns_.PURPLE text_color = _G_Patterns_.BLUE
}, },
plot = _G_Widget_.ScalePlot{ plot = _G_Widget_.ScalePlot{
x = _G_INIT_DATA_.CENTER_LEFT_X, x = _G_INIT_DATA_.CENTER_LEFT_X,

View File

@ -30,14 +30,14 @@ local kernel = _G_Widget_.Text{
y = header.bottom_y, y = header.bottom_y,
x_align = 'right', x_align = 'right',
text = Util.conky('$kernel'), text = Util.conky('$kernel'),
text_color = _G_Patterns_.PURPLE text_color = _G_Patterns_.BLUE
} }
local info = _G_Widget_.TextColumn{ local info = _G_Widget_.TextColumn{
x = _G_INIT_DATA_.LEFT_X + _G_INIT_DATA_.SECTION_WIDTH, x = _G_INIT_DATA_.LEFT_X + _G_INIT_DATA_.SECTION_WIDTH,
y = header.bottom_y + _TEXT_SPACING_, y = header.bottom_y + _TEXT_SPACING_,
spacing = _TEXT_SPACING_, spacing = _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
text_color = _G_Patterns_.PURPLE, text_color = _G_Patterns_.BLUE,
'<row1>', '<row1>',
'<row2>', '<row2>',
'<row3>' '<row3>'

View File

@ -10,10 +10,11 @@ M.LIGHT_GREY = Color.init{hex_rgba = 0xeeeeee}
M.MID_GREY = Color.init{hex_rgba = 0xd6d6d6} M.MID_GREY = Color.init{hex_rgba = 0xd6d6d6}
M.DARK_GREY = Color.init{hex_rgba = 0x888888} M.DARK_GREY = Color.init{hex_rgba = 0x888888}
M.BLUE = Color.init{hex_rgba = 0x9ed2ff} M.BLUE = Color.init{hex_rgba = 0xbfe1ff}
M.RED = Color.init{hex_rgba = 0xff8282} M.RED = Color.init{hex_rgba = 0xff8282}
M.PURPLE = Color.init{hex_rgba = 0xc7adff} M.PURPLE = Color.init{hex_rgba = 0xcb91ff}
M.YELLOW = Color.init{hex_rgba = 0xefe7aa} M.YELLOW = Color.init{hex_rgba = 0xefe7aa
}
-- arc patterns -- arc patterns
local GREY2 = 0xbfbfbf local GREY2 = 0xbfbfbf
local GREY5 = 0x565656 local GREY5 = 0x565656
@ -39,8 +40,8 @@ M.RED_ROUNDED = Color.Gradient{
Color.ColorStop{hex_rgba = RED1, stop = 1.0} Color.ColorStop{hex_rgba = RED1, stop = 1.0}
} }
local PURPLE1 = 0xe0d1ff local PURPLE1 = 0xeecfff
local PURPLE3 = 0x6924ff local PURPLE3 = 0x9523ff
M.PURPLE_ROUNDED = Color.Gradient{ M.PURPLE_ROUNDED = Color.Gradient{
Color.ColorStop{hex_rgba = PURPLE3, stop = 0.0}, Color.ColorStop{hex_rgba = PURPLE3, stop = 0.0},
Color.ColorStop{hex_rgba = PURPLE1, stop = 0.5}, Color.ColorStop{hex_rgba = PURPLE1, stop = 0.5},
@ -67,10 +68,10 @@ M.PLOT_FILL_BLUE = Color.Gradient{
Color.ColorStop{hex_rgba = PLOT_BLUE4, stop = 1.0, alpha = 1.0} Color.ColorStop{hex_rgba = PLOT_BLUE4, stop = 1.0, alpha = 1.0}
} }
local PLOT_PURPLE1 = 0x250075 local PLOT_PURPLE1 = 0x3e0077
local PLOT_PURPLE2 = 0x6924ff local PLOT_PURPLE2 = 0x9523ff
local PLOT_PURPLE3 = 0x532fa2 local PLOT_PURPLE3 = 0x7a30a3
local PLOT_PURPLE4 = 0xd5c2ff local PLOT_PURPLE4 = 0xeac4ff
M.PLOT_LINE_PURPLE = Color.Gradient{ M.PLOT_LINE_PURPLE = Color.Gradient{
Color.ColorStop{hex_rgba = PLOT_PURPLE1, stop = 0.0}, Color.ColorStop{hex_rgba = PLOT_PURPLE1, stop = 0.0},
Color.ColorStop{hex_rgba = PLOT_PURPLE2, stop = 1.0} Color.ColorStop{hex_rgba = PLOT_PURPLE2, stop = 1.0}