From 9d1956794e0f612cc62d1f0cb1c246321ff123a9 Mon Sep 17 00:00:00 2001 From: Zak Saunders Date: Fri, 30 Dec 2022 01:56:29 +0000 Subject: [PATCH] Fixed: Progress bar text colour in Dark theme (cherry picked from commit ca61efa57fc04a7f6753aedb4b8044d17e345429) --- frontend/src/Components/ProgressBar.css | 6 +++++- frontend/src/Styles/Themes/dark.js | 2 ++ frontend/src/Styles/Themes/light.js | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/src/Components/ProgressBar.css b/frontend/src/Components/ProgressBar.css index c509d9623..5b44bbcb0 100644 --- a/frontend/src/Components/ProgressBar.css +++ b/frontend/src/Components/ProgressBar.css @@ -20,7 +20,11 @@ .frontTextContainer { z-index: 1; - color: var(--white); + color: var(--progressBarFrontTextColor); +} + +.backTextContainer { + color: var(--progressBarBackTextColor); } .backTextContainer, diff --git a/frontend/src/Styles/Themes/dark.js b/frontend/src/Styles/Themes/dark.js index 9eb83f572..5533a25e4 100644 --- a/frontend/src/Styles/Themes/dark.js +++ b/frontend/src/Styles/Themes/dark.js @@ -226,6 +226,8 @@ module.exports = { // // Misc + progressBarFrontTextColor: white, + progressBarBackTextColor: white, progressBarBackgroundColor: '#727070', logEventsBackgroundColor: '#2a2a2a' }; diff --git a/frontend/src/Styles/Themes/light.js b/frontend/src/Styles/Themes/light.js index d6836aacf..e40f5023e 100644 --- a/frontend/src/Styles/Themes/light.js +++ b/frontend/src/Styles/Themes/light.js @@ -227,6 +227,8 @@ module.exports = { // // Misc - progressBarBackgroundColor: '#fff', - logEventsBackgroundColor: '#fff' + progressBarFrontTextColor: white, + progressBarBackTextColor: darkGray, + progressBarBackgroundColor: white, + logEventsBackgroundColor: white };