variant: fix inconsistent color variable naming matcornic#200

McShelby · McShelby · commit 4c50e5fe6bd4 · 2022-02-24T12:30:20.000+01:00
diff --git a/static/css/theme-blue.css b/static/css/theme-blue.css
@@ -30,7 +30,7 @@
 
     --MENU-SEARCH-color: #ffffff; /* Color of search field text */
     --MENU-SEARCH-BG-color: #167ad0; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #33a1ff; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #33a1ff; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: #20272b; /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: #252c31; /* Background color of other sections */
diff --git a/static/css/theme-green.css b/static/css/theme-green.css
@@ -30,7 +30,7 @@
 
     --MENU-SEARCH-color: #ffffff; /* Color of search field text */
     --MENU-SEARCH-BG-color: #599a3e; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #84c767; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #84c767; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: #1b211c; /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: #222723; /* Background color of other sections */
diff --git a/static/css/theme-learn.css b/static/css/theme-learn.css
@@ -30,7 +30,7 @@
 
     --MENU-SEARCH-color: #ffffff; /* Color of search field text */
     --MENU-SEARCH-BG-color: #764890; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #915eae; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #915eae; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: #251f29; /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: #322a38; /* Background color of other sections */
diff --git a/static/css/theme-neon.css b/static/css/theme-neon.css
@@ -37,7 +37,7 @@
 
     --MENU-SEARCH-color: #e0e0e0; /* Color of search field text */
     --MENU-SEARCH-BG-color: #323232; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #e0e0e0; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #e0e0e0; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: rgba( 0, 0, 0, .166 ); /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: linear-gradient( 165deg, #f300b2d3 0%, #1c90f3b3 65%, #00e3d3b3 100% ); /* Background color of side bar */
@@ -71,8 +71,8 @@
 body a#logo,
 body #logo svg,
 body #logo svg * {
-  color: var(--INTERNAL-MENU-SEARCH-BOX-color);
-  fill: var(--INTERNAL-MENU-SEARCH-BOX-color) !important;
+  color: var(--INTERNAL-MENU-SEARCH-BORDER-color);
+  fill: var(--INTERNAL-MENU-SEARCH-BORDER-color) !important;
 }
 
 body a#logo{
diff --git a/static/css/theme-red.css b/static/css/theme-red.css
@@ -30,7 +30,7 @@
 
     --MENU-SEARCH-color: #ffffff; /* Color of search field text */
     --MENU-SEARCH-BG-color: #b90000; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #ef2020; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #ef2020; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: #2b2020; /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: #312525; /* Background color of other sections */
diff --git a/static/css/theme-relearn-dark.css b/static/css/theme-relearn-dark.css
@@ -30,7 +30,7 @@
 
     --MENU-SEARCH-color: #e0e0e0; /* Color of search field text */
     --MENU-SEARCH-BG-color: #323232; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #e0e0e0; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #e0e0e0; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: #323232; /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: #2b2b2b; /* Background color of other sections */
diff --git a/static/css/theme-relearn-light.css b/static/css/theme-relearn-light.css
@@ -30,7 +30,7 @@
 
     --MENU-SEARCH-color: #e0e0e0; /* Color of search field text */
     --MENU-SEARCH-BG-color: #323232; /* Search field background color (by default borders + icons) */
-    --MENU-SEARCH-BOX-color: #e0e0e0; /* Override search field border color */
+    --MENU-SEARCH-BORDER-color: #e0e0e0; /* Override search field border color */
 
     --MENU-SECTIONS-ACTIVE-BG-color: rgba( 0, 0, 0, .166 ); /* Background color of the active section and its children */
     --MENU-SECTIONS-BG-color: #282828; /* Background color of other sections */
diff --git a/static/css/theme.css b/static/css/theme.css
@@ -118,7 +118,7 @@ th {
 }
 
 .searchbox {
-    border: 1px solid #e0e0e0; /* var(--MENU-SEARCH-BOX-color) */
+    border: 1px solid #e0e0e0; /* var(--MENU-SEARCH-BORDER-color) */
     border-radius: 4px;
     background-color: #323232; /* var(--MENU-SEARCH-BG-color) */
     position: relative;
diff --git a/static/css/variant.css b/static/css/variant.css
@@ -31,7 +31,7 @@
 
     --INTERNAL-MENU-SEARCH-color: var(--MENU-SEARCH-color, var(--MENU-SEARCH-BOX-ICONS-color, #e0e0e0));
     --INTERNAL-MENU-SEARCH-BG-color: var(--MENU-SEARCH-BG-color, #323232);
-    --INTERNAL-MENU-SEARCH-BOX-color: var(--MENU-SEARCH-BOX-color, var(--INTERNAL-MENU-SEARCH-BG-color));
+    --INTERNAL-MENU-SEARCH-BORDER-color: var(--MENU-SEARCH-BORDER-color, var(--MENU-SEARCH-BOX-color, var(--INTERNAL-MENU-SEARCH-BG-color)));
 
     --INTERNAL-MENU-SECTIONS-ACTIVE-BG-color: var(--MENU-SECTIONS-ACTIVE-BG-color, rgba( 0, 0, 0, .166 ));
     --INTERNAL-MENU-SECTIONS-BG-color: var(--MENU-SECTIONS-BG-color, #282828);
@@ -99,7 +99,7 @@ a:hover,
 }
 
 .searchbox {
-    border-color: var(--INTERNAL-MENU-SEARCH-BOX-color);
+    border-color: var(--INTERNAL-MENU-SEARCH-BORDER-color);
     background-color: var(--INTERNAL-MENU-SEARCH-BG-color);
 }
 
diff --git a/static/js/variant.js b/static/js/variant.js
@@ -474,7 +474,7 @@ var variants = {
 		{ name: 'MENU-HOME-LINK-HOVER-color',            group: 'header',         default: '#808080',                     tooltip: 'hoverd home button color if configured', },
 		{ name: 'MENU-SEARCH-color',                     group: 'header',         default: '#e0e0e0',                     tooltip: 'text and icon color of search box', },
 		{ name: 'MENU-SEARCH-BG-color',                  group: 'header',         default: '#323232',                     tooltip: 'background color of search box', },
-		{ name: 'MENU-SEARCH-BOX-color',                 group: 'header',        fallback: 'MENU-SEARCH-BG-color',        tooltip: 'border color of search box', },
+		{ name: 'MENU-SEARCH-BORDER-color',              group: 'header',        fallback: 'MENU-SEARCH-BG-color',        tooltip: 'border color of search box', },
 
 		{ name: 'MENU-SECTIONS-BG-color',                group: 'sections',       default: '#282828',                     tooltip: 'background of the menu; this is NOT just a color value but can be a complete CSS background definition including gradients, etc.', },
 		{ name: 'MENU-SECTIONS-ACTIVE-BG-color',         group: 'sections',       default: 'rgba( 0, 0, 0, .166 )',       tooltip: 'background color of the active menu section', },

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ th {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`.searchbox {`
`121`		`- border: 1px solid #e0e0e0; /* var(--MENU-SEARCH-BOX-color) */`
	`121`	`+ border: 1px solid #e0e0e0; /* var(--MENU-SEARCH-BORDER-color) */`
`122`	`122`	`border-radius: 4px;`
`123`	`123`	`background-color: #323232; /* var(--MENU-SEARCH-BG-color) */`
`124`	`124`	`position: relative;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`
`32`	`32`	`--INTERNAL-MENU-SEARCH-color: var(--MENU-SEARCH-color, var(--MENU-SEARCH-BOX-ICONS-color, #e0e0e0));`
`33`	`33`	`--INTERNAL-MENU-SEARCH-BG-color: var(--MENU-SEARCH-BG-color, #323232);`
`34`		`- --INTERNAL-MENU-SEARCH-BOX-color: var(--MENU-SEARCH-BOX-color, var(--INTERNAL-MENU-SEARCH-BG-color));`
	`34`	`+ --INTERNAL-MENU-SEARCH-BORDER-color: var(--MENU-SEARCH-BORDER-color, var(--MENU-SEARCH-BOX-color, var(--INTERNAL-MENU-SEARCH-BG-color)));`
`35`	`35`
`36`	`36`	`--INTERNAL-MENU-SECTIONS-ACTIVE-BG-color: var(--MENU-SECTIONS-ACTIVE-BG-color, rgba( 0, 0, 0, .166 ));`
`37`	`37`	`--INTERNAL-MENU-SECTIONS-BG-color: var(--MENU-SECTIONS-BG-color, #282828);`
`@@ -99,7 +99,7 @@ a:hover,`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`.searchbox {`
`102`		`- border-color: var(--INTERNAL-MENU-SEARCH-BOX-color);`
	`102`	`+ border-color: var(--INTERNAL-MENU-SEARCH-BORDER-color);`
`103`	`103`	`background-color: var(--INTERNAL-MENU-SEARCH-BG-color);`
`104`	`104`	`}`
`105`	`105`