diff --git a/core b/core index 8491d3c..9714d03 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8491d3c1bb69894f5a48fcce380920877af924ed +Subproject commit 9714d033f440af3b3748f33839455b5ec376be67 diff --git a/schema/Patterns.lua b/schema/Patterns.lua index 76e3845..b63764b 100644 --- a/schema/Patterns.lua +++ b/schema/Patterns.lua @@ -20,34 +20,34 @@ M.CRITICAL_FG = Color.rgb(0xff8282) -- arc patterns local GREY2 = 0xbfbfbf local GREY5 = 0x565656 -M.INDICATOR_BG = Color.gradient{ - Color.colorstop_rgb(GREY5, 0.0), - Color.colorstop_rgb(GREY2, 0.5), - Color.colorstop_rgb(GREY5, 1.0) +M.INDICATOR_BG = Color.gradient_rgb{ + [0.0] = GREY5, + [0.5] = GREY2, + [1.0] = GREY5 } local BLUE1 = 0x99CEFF local BLUE3 = 0x316BA6 -M.INDICATOR_FG_PRIMARY = Color.gradient{ - Color.colorstop_rgb(BLUE3, 0.0), - Color.colorstop_rgb(BLUE1, 0.5), - Color.colorstop_rgb(BLUE3, 1.0) +M.INDICATOR_FG_PRIMARY = Color.gradient_rgb{ + [0.0] = BLUE3, + [0.5] = BLUE1, + [1.0] = BLUE3 } local PURPLE1 = 0xeecfff local PURPLE3 = 0x9523ff -M.INDICATOR_FG_SECONDARY = Color.gradient{ - Color.colorstop_rgb(PURPLE3, 0.0), - Color.colorstop_rgb(PURPLE1, 0.5), - Color.colorstop_rgb(PURPLE3, 1.0) +M.INDICATOR_FG_SECONDARY = Color.gradient_rgb{ + [0.0] = PURPLE3, + [0.5] = PURPLE1, + [1.0] = PURPLE3 } local RED1 = 0xFF3333 local RED3 = 0xFFB8B8 -M.INDICATOR_FG_CRITICAL = Color.gradient{ - Color.colorstop_rgb(RED1, 0.0), - Color.colorstop_rgb(RED3, 0.5), - Color.colorstop_rgb(RED1, 1.0) +M.INDICATOR_FG_CRITICAL = Color.gradient_rgb{ + [0.0] = RED1, + [0.5] = RED3, + [1.0] = RED1 } -- plot patterns @@ -55,42 +55,42 @@ local PLOT_BLUE1 = 0x003f7c local PLOT_BLUE2 = 0x1e90ff local PLOT_BLUE3 = 0x316ece local PLOT_BLUE4 = 0x8cc7ff -M.PLOT_FILL_BORDER_PRIMARY = Color.gradient{ - Color.colorstop_rgb(PLOT_BLUE1, 0.0), - Color.colorstop_rgb(PLOT_BLUE2, 1.0) +M.PLOT_FILL_BORDER_PRIMARY = Color.gradient_rgb{ + [0.0] = PLOT_BLUE1, + [1.0] = PLOT_BLUE2 } -M.PLOT_FILL_BG_PRIMARY = Color.gradient{ - Color.colorstop_rgba(PLOT_BLUE3, 0.2, 0.0), - Color.colorstop_rgba(PLOT_BLUE4, 1.0, 1.0) +M.PLOT_FILL_BG_PRIMARY = Color.gradient_rgba{ + [0.2] = {PLOT_BLUE3, 0.0}, + [1.0] = {PLOT_BLUE4, 1.0} } local PLOT_PURPLE1 = 0x3e0077 local PLOT_PURPLE2 = 0x9523ff local PLOT_PURPLE3 = 0x7a30a3 local PLOT_PURPLE4 = 0xeac4ff -M.PLOT_FILL_BORDER_SECONDARY = Color.gradient{ - Color.colorstop_rgb(PLOT_PURPLE1, 0.0), - Color.colorstop_rgb(PLOT_PURPLE2, 1.0) +M.PLOT_FILL_BORDER_SECONDARY = Color.gradient_rgb{ + [0.0] = PLOT_PURPLE1, + [1.0] = PLOT_PURPLE2 } -M.PLOT_FILL_BG_SECONDARY = Color.gradient{ - Color.colorstop_rgba(PLOT_PURPLE3, 0.2, 0.0), - Color.colorstop_rgba(PLOT_PURPLE4, 1.0, 1.0) +M.PLOT_FILL_BG_SECONDARY = Color.gradient_rgba{ + [0.2] = {PLOT_PURPLE3, 0.0}, + [1.0] = {PLOT_PURPLE4, 1.0} } local PLOT_YELLOW1 = 0x231f00 local PLOT_YELLOW2 = 0x7c6f00 local PLOT_YELLOW3 = 0x8c8225 local PLOT_YELLOW4 = 0xfff387 -M.PLOT_FILL_BORDER_TERTIARY = Color.gradient{ - Color.colorstop_rgb(PLOT_YELLOW1, 0.0), - Color.colorstop_rgb(PLOT_YELLOW2, 1.0) +M.PLOT_FILL_BORDER_TERTIARY = Color.gradient_rgb{ + [0.0] = PLOT_YELLOW1, + [1.0] = PLOT_YELLOW2 } -M.PLOT_FILL_BG_TERTIARY = Color.gradient{ - Color.colorstop_rgba(PLOT_YELLOW3, 0.2, 0.0), - Color.colorstop_rgba(PLOT_YELLOW4, 1.0, 1.0) +M.PLOT_FILL_BG_TERTIARY = Color.gradient_rgba{ + [0.2] = {PLOT_YELLOW3, 0.0}, + [1.0] = {PLOT_YELLOW4, 1.0} } -- panel pattern