forgto to rename these colors

This commit is contained in:
petrucci4prez 2017-07-19 00:27:37 -04:00
parent 3de81cfe76
commit 17117a914c
11 changed files with 30 additions and 30 deletions

2
core

@ -1 +1 @@
Subproject commit 4c481f811ab7107883dc9ada123652574a8575f6 Subproject commit 9a3912cc2879099d154ec6e267106db885e0fd7f

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 = schema.blue, text_color = schema.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 = schema.blue, text_color = schema.BLUE,
text = '<gpu_temp>' text = '<gpu_temp>'
} }
} }
@ -77,7 +77,7 @@ local pci_util = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _PCI_UTIL_Y_, y = _PCI_UTIL_Y_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
text = '<pci_util>' text = '<pci_util>'
} }
} }
@ -104,7 +104,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 = schema.blue, text_color = schema.BLUE,
num_rows = 2 num_rows = 2
} }
} }
@ -128,7 +128,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 = schema.blue, text_color = schema.BLUE,
text = '<gpu_util>' text = '<gpu_util>'
}, },
plot = Widget.LabelPlot{ plot = Widget.LabelPlot{
@ -151,7 +151,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 = schema.blue, text_color = schema.BLUE,
text = '<mem_util>' text = '<mem_util>'
}, },
plot = Widget.LabelPlot{ plot = Widget.LabelPlot{
@ -174,7 +174,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 = schema.blue, text_color = schema.BLUE,
text = '<vid_util>' text = '<vid_util>'
}, },
plot = Widget.LabelPlot{ plot = Widget.LabelPlot{

View File

@ -119,7 +119,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 = schema.purple, text_color = schema.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 = schema.blue text_color = schema.BLUE
}, },
plot = Widget.ScalePlot{ plot = 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 = schema.blue text_color = schema.BLUE
}, },
plot = Widget.ScalePlot{ plot = Widget.ScalePlot{
x = _G_INIT_DATA_.CENTER_RIGHT_X, x = _G_INIT_DATA_.CENTER_RIGHT_X,

View File

@ -37,7 +37,7 @@ local info = Widget.TextColumn{
y = header.bottom_y, y = header.bottom_y,
spacing = _TEXT_SPACING_, spacing = _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
num_rows = 5 num_rows = 5
} }

View File

@ -44,7 +44,7 @@ local pp01 = {
y = header.bottom_y, y = header.bottom_y,
spacing = _TEXT_SPACING_, spacing = _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
append_end = ' W', append_end = ' W',
num_rows = 2 num_rows = 2
} }
@ -69,7 +69,7 @@ local pkg0 = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _PKG0_Y_, y = _PKG0_Y_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
text = '<pkg0>', text = '<pkg0>',
append_end = ' W' append_end = ' W'
}, },
@ -94,7 +94,7 @@ local dram = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _DRAM_Y_, y = _DRAM_Y_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
text = '<dram>', text = '<dram>',
append_end = ' W' append_end = ' W'
}, },

View File

@ -109,7 +109,7 @@ local process = {
x = _RIGHT_X_, x = _RIGHT_X_,
y = _PROCESS_Y_, y = _PROCESS_Y_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
text = '<R.S.D.T.Z>' text = '<R.S.D.T.Z>'
} }
} }

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 = schema.blue text_color = schema.BLUE
}, },
plot = Widget.ScalePlot{ plot = 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 = schema.blue text_color = schema.BLUE
}, },
plot = Widget.ScalePlot{ plot = Widget.ScalePlot{
x = _G_INIT_DATA_.CENTER_LEFT_X, x = _G_INIT_DATA_.CENTER_LEFT_X,

View File

@ -35,7 +35,7 @@ local info = Widget.TextColumn{
y = header.bottom_y, y = header.bottom_y,
spacing = _TEXT_SPACING_, spacing = _TEXT_SPACING_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
util.conky('$kernel'), util.conky('$kernel'),
'<row2>', '<row2>',
'<row3>', '<row3>',

View File

@ -39,14 +39,14 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl)
current_row.desc = Widget.Text{ current_row.desc = Widget.Text{
x = side_rows_x, x = side_rows_x,
y = current_row_y, y = current_row_y,
text_color = schema.blue, text_color = schema.BLUE,
} }
current_row.period = Widget.Text{ current_row.period = Widget.Text{
x = side_rows_x + _G_INIT_DATA_.SECTION_WIDTH, x = side_rows_x + _G_INIT_DATA_.SECTION_WIDTH,
y = current_row_y, y = current_row_y,
x_align = 'right', x_align = 'right',
text_color = schema.blue text_color = schema.BLUE
} }
current_row.icon = Widget.ScaledImage{ current_row.icon = Widget.ScaledImage{
@ -61,7 +61,7 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl)
y = current_row_y + _HEADER_PAD_ + 25, y = current_row_y + _HEADER_PAD_ + 25,
x_align = 'center', x_align = 'center',
font_size = 28, font_size = 28,
text_color = schema.blue text_color = schema.BLUE
} }
current_row.temp2 = Widget.Text{ current_row.temp2 = Widget.Text{
@ -85,7 +85,7 @@ local create_side_rows = function(side_rows_x, side_rows_y, side_rows_tbl)
y = current_row_y + _HEADER_PAD_ + 15, y = current_row_y + _HEADER_PAD_ + 15,
spacing = _SPACING_, spacing = _SPACING_,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
num_rows = 3 num_rows = 3
} }
@ -131,7 +131,7 @@ center.header = Widget.Header{
center.current_desc = Widget.Text{ center.current_desc = Widget.Text{
x = _G_INIT_DATA_.CENTER_LEFT_X, x = _G_INIT_DATA_.CENTER_LEFT_X,
y = center.header.bottom_y + 8, y = center.header.bottom_y + 8,
text_color = schema.blue, text_color = schema.BLUE,
font_size = 24 font_size = 24
} }
@ -153,7 +153,7 @@ center.current_temp = Widget.Text{
y = _INFO_Y_, y = _INFO_Y_,
x_align = 'center', x_align = 'center',
font_size = 48, font_size = 48,
text_color = schema.blue text_color = schema.BLUE
} }
center.obs_time = Widget.Text{ center.obs_time = Widget.Text{
@ -191,7 +191,7 @@ center.info_column_1 = Widget.TextColumn{
x = _G_INIT_DATA_.CENTER_RIGHT_X + (_G_INIT_DATA_.SECTION_WIDTH - _COLUMN_PADDING_) / 2, x = _G_INIT_DATA_.CENTER_RIGHT_X + (_G_INIT_DATA_.SECTION_WIDTH - _COLUMN_PADDING_) / 2,
y = center.header.bottom_y, y = center.header.bottom_y,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
spacing = _CENTER_SPACING_, spacing = _CENTER_SPACING_,
font_size = 14, font_size = 14,
num_rows = 7 num_rows = 7
@ -215,7 +215,7 @@ center.info_column_2 = Widget.TextColumn{
x = _G_INIT_DATA_.CENTER_RIGHT_X + _G_INIT_DATA_.SECTION_WIDTH, x = _G_INIT_DATA_.CENTER_RIGHT_X + _G_INIT_DATA_.SECTION_WIDTH,
y = center.header.bottom_y, y = center.header.bottom_y,
x_align = 'right', x_align = 'right',
text_color = schema.blue, text_color = schema.BLUE,
spacing = _CENTER_SPACING_, spacing = _CENTER_SPACING_,
font_size = 14, font_size = 14,
num_rows = 7 num_rows = 7

View File

@ -30,9 +30,9 @@ M.LIGHT_GREY = Color.init{hex_rgba = GREY1}
M.MID_GREY = Color.init{hex_rgba = GREY3} M.MID_GREY = Color.init{hex_rgba = GREY3}
M.DARK_GREY = Color.init{hex_rgba = GREY4} M.DARK_GREY = Color.init{hex_rgba = GREY4}
M.blue = Color.init{hex_rgba = BLUE2} M.BLUE = Color.init{hex_rgba = BLUE2}
M.red = Color.init{hex_rgba = RED2} M.RED = Color.init{hex_rgba = RED2}
M.purple = Color.init{hex_rgba = PURPLE2} M.PURPLE = Color.init{hex_rgba = PURPLE2}
M.GREY_ROUNDED = Color.Gradient{ M.GREY_ROUNDED = Color.Gradient{
Color.ColorStop{hex_rgba = GREY5, stop = 0.0}, Color.ColorStop{hex_rgba = GREY5, stop = 0.0},