From e9295f4bbfe367f72bdf0238d3277d4ac2a67f36 Mon Sep 17 00:00:00 2001 From: Redromnon Date: Fri, 28 Oct 2022 12:27:53 +0530 Subject: [PATCH 1/2] Split action icon CSS variables --- src/frontend/components/UI/FormControl/index.css | 6 +++--- src/frontend/styles/_colors.scss | 5 +++++ src/frontend/themes.css | 12 ++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/frontend/components/UI/FormControl/index.css b/src/frontend/components/UI/FormControl/index.css index dc0c31689c..e1a965e337 100644 --- a/src/frontend/components/UI/FormControl/index.css +++ b/src/frontend/components/UI/FormControl/index.css @@ -72,16 +72,16 @@ font-size: var(--text-sm); text-transform: uppercase; font-weight: var(--semibold); - color: var(--text-default); + color: var(--action-icon); } .FormControl--segmented > button:not(:disabled):hover { - color: var(--text-hover); + color: var(--action-icon-hover); } .FormControl--segmented > button:not(.non-important):active, .FormControl--segmented > button:not(.non-important).active { - color: var(--accent); + color: var(--action-icon-active); } .FormControl--segmented > button:not(:first-child) { diff --git a/src/frontend/styles/_colors.scss b/src/frontend/styles/_colors.scss index f7e67234c4..7bef92dab8 100644 --- a/src/frontend/styles/_colors.scss +++ b/src/frontend/styles/_colors.scss @@ -78,6 +78,11 @@ --text-tertiary: #101111; /* This is not defined in figma */ --text-quartenary: #5a5e5f; /* this is meant to be a background colour */ --text-danger: #d22121; + + /*Action Icons*/ + --action-icon: var(--text-default); + --action-icon-hover: var(--text-hover); + --action-icon-active: var(--accent); } body { diff --git a/src/frontend/themes.css b/src/frontend/themes.css index 43e9f7e2aa..ace518f05f 100644 --- a/src/frontend/themes.css +++ b/src/frontend/themes.css @@ -30,6 +30,9 @@ body.dracula-classic { --osk-background: var(--body-background); --osk-button-background: var(--input-background); --osk-button-border: var(--navbar-background); + --action-icon: #35e461; + --action-icon-hover: var(--text-hover); + --action-icon-active: var(--accent); } body.marine, @@ -53,6 +56,9 @@ body.marine-classic { --osk-background: var(--body-background); --osk-button-background: var(--input-background); --osk-button-border: var(--navbar-background); + --action-icon: var(--text-default); + --action-icon-hover: var(--text-hover); + --action-icon-active: var(--accent); } body.zombie, @@ -79,6 +85,9 @@ body.zombie-classic { --osk-background: var(--body-background); --osk-button-background: var(--input-background); --osk-button-border: #434343; + --action-icon: var(--text-default); + --action-icon-hover: var(--text-hover); + --action-icon-active: var(--accent); } body.old-school { @@ -104,6 +113,9 @@ body.old-school { --osk-background: var(--body-background); --osk-button-background: var(--input-background); --osk-button-border: #434343; + --action-icon: var(--text-default); + --action-icon-hover: var(--text-hover); + --action-icon-active: var(--accent); } body.classic, From 906d10909c6dca149648f3a1118ef82fd04f7361 Mon Sep 17 00:00:00 2001 From: Redromnon Date: Fri, 28 Oct 2022 12:34:03 +0530 Subject: [PATCH 2/2] Fix Dracula theme action-icon mistake --- src/frontend/themes.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/themes.css b/src/frontend/themes.css index ace518f05f..27d06a604e 100644 --- a/src/frontend/themes.css +++ b/src/frontend/themes.css @@ -30,7 +30,7 @@ body.dracula-classic { --osk-background: var(--body-background); --osk-button-background: var(--input-background); --osk-button-border: var(--navbar-background); - --action-icon: #35e461; + --action-icon: var(--text-default); --action-icon-hover: var(--text-hover); --action-icon-active: var(--accent); }