From fa0ad15c70340d4bcdc82878830ab0b7c07bf380 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Tue, 28 Jan 2020 20:22:15 -0500 Subject: [PATCH] Revert "ENH change color sheme" This reverts commit bd36011119a35220d5038e8ae80ba1da71bda48d. --- drawing/Graphics.lua | 12 ++++++------ drawing/Memory.lua | 4 ++-- drawing/Network.lua | 4 ++-- drawing/Pacman.lua | 2 +- drawing/Power.lua | 4 ++-- drawing/Processor.lua | 2 +- drawing/ReadWrite.lua | 4 ++-- drawing/System.lua | 4 ++-- schema/Patterns.lua | 19 ++++++++++--------- 9 files changed, 28 insertions(+), 27 deletions(-) diff --git a/drawing/Graphics.lua b/drawing/Graphics.lua index 6a1e6b1..e2a99ed 100644 --- a/drawing/Graphics.lua +++ b/drawing/Graphics.lua @@ -36,7 +36,7 @@ local status = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '' } } @@ -60,7 +60,7 @@ local internal_temp = { x = _RIGHT_X_, y = _INTERNAL_TEMP_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '' } } @@ -87,7 +87,7 @@ local clock_speed = { y = _CLOCK_SPEED_Y_, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, num_rows = 2 } } @@ -111,7 +111,7 @@ local gpu_util = { x = _RIGHT_X_, y = _GPU_UTIL_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '' }, plot = _G_Widget_.LabelPlot{ @@ -134,7 +134,7 @@ local mem_util = { x = _RIGHT_X_, y = _MEM_UTIL_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '' }, plot = _G_Widget_.LabelPlot{ @@ -157,7 +157,7 @@ local vid_util = { x = _RIGHT_X_, y = _VID_UTIL_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '' }, plot = _G_Widget_.LabelPlot{ diff --git a/drawing/Memory.lua b/drawing/Memory.lua index d0325dd..7b4b0d4 100644 --- a/drawing/Memory.lua +++ b/drawing/Memory.lua @@ -61,7 +61,7 @@ local cache_arc = _G_Widget_.Arc{ y = DIAL_Y, radius = DIAL_RADIUS, thickness = _DIAL_THICKNESS_, - arc_pattern = _G_Patterns_.BLUE_ROUNDED + arc_pattern = _G_Patterns_.PURPLE_ROUNDED } local total_used = _G_Widget_.CriticalText{ @@ -113,7 +113,7 @@ local cache = { y = _LINE_1_Y_ + _TEXT_SPACING_, x_align = 'right', append_end = ' %', - text_color = _G_Patterns_.BLUE, + text_color = _G_Patterns_.PURPLE, '', '', '' diff --git a/drawing/Network.lua b/drawing/Network.lua index d94a90c..297a406 100644 --- a/drawing/Network.lua +++ b/drawing/Network.lua @@ -39,7 +39,7 @@ local dnload = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = _G_Patterns_.PURPLE + text_color = _G_Patterns_.BLUE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_RIGHT_X, @@ -62,7 +62,7 @@ local upload = { x = _RIGHT_X_, y = _UPLOAD_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE + text_color = _G_Patterns_.BLUE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_RIGHT_X, diff --git a/drawing/Pacman.lua b/drawing/Pacman.lua index 8454013..e6c90da 100644 --- a/drawing/Pacman.lua +++ b/drawing/Pacman.lua @@ -32,7 +32,7 @@ local info = _G_Widget_.TextColumn{ y = header.bottom_y, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, num_rows = 5 } diff --git a/drawing/Power.lua b/drawing/Power.lua index 0d3976a..a7d7999 100644 --- a/drawing/Power.lua +++ b/drawing/Power.lua @@ -41,7 +41,7 @@ local pkg0 = { x = _RIGHT_X_, y = header.bottom_y, x_align = 'right', - text_color = Patterns.PURPLE, + text_color = Patterns.BLUE, text = '', append_end = ' W', }, @@ -66,7 +66,7 @@ local dram = { x = _RIGHT_X_, y = _CORE_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '', append_end = ' W' }, diff --git a/drawing/Processor.lua b/drawing/Processor.lua index 7a109dc..838bdf8 100644 --- a/drawing/Processor.lua +++ b/drawing/Processor.lua @@ -139,7 +139,7 @@ local ave_freq = { x = _RIGHT_X_, y = _FREQ_Y_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, text = '' } } diff --git a/drawing/ReadWrite.lua b/drawing/ReadWrite.lua index b58ac40..0d7067a 100644 --- a/drawing/ReadWrite.lua +++ b/drawing/ReadWrite.lua @@ -69,7 +69,7 @@ local reads = { y = header.bottom_y, x_align = 'right', append_end=' B/s', - text_color = _G_Patterns_.PURPLE + text_color = _G_Patterns_.BLUE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_LEFT_X, @@ -93,7 +93,7 @@ local writes = { y = _WRITE_Y_, x_align = 'right', append_end =' B/s', - text_color = _G_Patterns_.PURPLE + text_color = _G_Patterns_.BLUE }, plot = _G_Widget_.ScalePlot{ x = _G_INIT_DATA_.CENTER_LEFT_X, diff --git a/drawing/System.lua b/drawing/System.lua index 7bef480..189be19 100644 --- a/drawing/System.lua +++ b/drawing/System.lua @@ -30,14 +30,14 @@ local kernel = _G_Widget_.Text{ y = header.bottom_y, x_align = 'right', text = Util.conky('$kernel'), - text_color = _G_Patterns_.PURPLE + text_color = _G_Patterns_.BLUE } local info = _G_Widget_.TextColumn{ x = _G_INIT_DATA_.LEFT_X + _G_INIT_DATA_.SECTION_WIDTH, y = header.bottom_y + _TEXT_SPACING_, spacing = _TEXT_SPACING_, x_align = 'right', - text_color = _G_Patterns_.PURPLE, + text_color = _G_Patterns_.BLUE, '', '', '' diff --git a/schema/Patterns.lua b/schema/Patterns.lua index 09ede58..dc6b031 100644 --- a/schema/Patterns.lua +++ b/schema/Patterns.lua @@ -10,10 +10,11 @@ M.LIGHT_GREY = Color.init{hex_rgba = 0xeeeeee} M.MID_GREY = Color.init{hex_rgba = 0xd6d6d6} 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.PURPLE = Color.init{hex_rgba = 0xc7adff} -M.YELLOW = Color.init{hex_rgba = 0xefe7aa} +M.PURPLE = Color.init{hex_rgba = 0xcb91ff} +M.YELLOW = Color.init{hex_rgba = 0xefe7aa +} -- arc patterns local GREY2 = 0xbfbfbf local GREY5 = 0x565656 @@ -39,8 +40,8 @@ M.RED_ROUNDED = Color.Gradient{ Color.ColorStop{hex_rgba = RED1, stop = 1.0} } -local PURPLE1 = 0xe0d1ff -local PURPLE3 = 0x6924ff +local PURPLE1 = 0xeecfff +local PURPLE3 = 0x9523ff M.PURPLE_ROUNDED = Color.Gradient{ Color.ColorStop{hex_rgba = PURPLE3, stop = 0.0}, 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} } -local PLOT_PURPLE1 = 0x250075 -local PLOT_PURPLE2 = 0x6924ff -local PLOT_PURPLE3 = 0x532fa2 -local PLOT_PURPLE4 = 0xd5c2ff +local PLOT_PURPLE1 = 0x3e0077 +local PLOT_PURPLE2 = 0x9523ff +local PLOT_PURPLE3 = 0x7a30a3 +local PLOT_PURPLE4 = 0xeac4ff M.PLOT_LINE_PURPLE = Color.Gradient{ Color.ColorStop{hex_rgba = PLOT_PURPLE1, stop = 0.0}, Color.ColorStop{hex_rgba = PLOT_PURPLE2, stop = 1.0}