From c9fe9e235412d80f458f8d11d38599982e779c16 Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Thu, 31 Mar 2022 17:20:25 -0400 Subject: [PATCH 01/10] Added boxes and slight colors Bronze, silver, gold boxes added. Silver is done, gold is being worked on --- KeyCtrl/src/App.css | 22 +++++++++++++++++++ .../components/SettingsPage/ThemeSelect.js | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index a3d2e1c..da6aafb 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -245,4 +245,26 @@ --selection-color: #fbc401; --bg-color: #122738; --dark-bg: #193549; +} + +[data-theme="silver"]{ + --primary-color: #ffffff; + --text-container: #444444; + --secondary-color: #c16666; + --text-color: #a7a5a5; + --next-up-text-color: #a5a6a7; + --selection-color: #C0C0C0; + --bg-color: #464646; + --dark-bg: #282828; +} + +[data-theme="gold"]{ + --primary-color: #ffffff; + --text-container: #444444; + --secondary-color: #c16666; + --text-color: #fce981; + --next-up-text-color: #ffe96d; + --selection-color: #FFD700; + --bg-color: #464646; + --dark-bg: #282828; } \ No newline at end of file diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index 3e8ff9e..19c570e 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -179,6 +179,27 @@ const ThemeSelect = ({updateOptions}) => { onClick={() => changeTheme('cobalt')}> cobalt + changeTheme('bronze')}> + bronze + + changeTheme('silver')}> + silver + + changeTheme('gold')}> + gold + ) From eb7617c9bb05584de8fc99de4e523a08a94b269b Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Sat, 2 Apr 2022 20:26:50 -0400 Subject: [PATCH 02/10] Fixed colors for gold n silver Updated some colors for gold and silver --- KeyCtrl/src/App.css | 4 ++-- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index da6aafb..c34ea9b 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -248,7 +248,7 @@ } [data-theme="silver"]{ - --primary-color: #ffffff; + --primary-color: #464646; --text-container: #444444; --secondary-color: #c16666; --text-color: #a7a5a5; @@ -259,7 +259,7 @@ } [data-theme="gold"]{ - --primary-color: #ffffff; + --primary-color: #464646; --text-container: #444444; --secondary-color: #c16666; --text-color: #fce981; diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index 19c570e..a68d1bf 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -194,7 +194,7 @@ const ThemeSelect = ({updateOptions}) => { silver changeTheme('gold')}> From 42b215507db869ed17593523ce8c698c228a6432 Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Tue, 5 Apr 2022 17:11:44 -0400 Subject: [PATCH 03/10] Added Bronze, and Wood Bronze looks bad but wood looks amazing --- KeyCtrl/src/App.css | 22 +++++++++++++++++++ .../components/SettingsPage/ThemeSelect.js | 7 ++++++ 2 files changed, 29 insertions(+) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index c34ea9b..8adc501 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -247,6 +247,28 @@ --dark-bg: #193549; } +[data-theme="wood"]{ + --primary-color: #bb9457; + --text-container: #bb9457; + --secondary-color: #6688c1; + --text-color: #ffe6a7; + --next-up-text-color: #ffe6a7; + --selection-color: #6f1d1b; + --bg-color: #99582a; + --dark-bg: #432818; +} + +[data-theme="bronze"]{ + --primary-color: #9c832f; + --text-container: #3a3b2d; + --secondary-color: #6688c1; + --text-color: #c49515; + --next-up-text-color: #db9004; + --selection-color: #b67534; + --bg-color: #795c0d; + --dark-bg: #6f5006; +} + [data-theme="silver"]{ --primary-color: #464646; --text-container: #444444; diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index a68d1bf..ca2226a 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -179,6 +179,13 @@ const ThemeSelect = ({updateOptions}) => { onClick={() => changeTheme('cobalt')}> cobalt + changeTheme('wood')}> + wood + Date: Tue, 5 Apr 2022 17:14:55 -0400 Subject: [PATCH 04/10] Border fix for wood fixed border thats all --- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index ca2226a..427a9c2 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -180,9 +180,9 @@ const ThemeSelect = ({updateOptions}) => { cobalt changeTheme('wood')}> wood From a757f63d68828172c7d8028bbbad03852dca2e4e Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Fri, 15 Apr 2022 01:26:56 -0400 Subject: [PATCH 05/10] Added diamond and Challenger themes 2 themes added --- KeyCtrl/src/App.css | 30 +++++++++++++++++++ .../components/SettingsPage/ThemeSelect.js | 21 +++++++++++++ 2 files changed, 51 insertions(+) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index 8adc501..e63555e 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -289,4 +289,34 @@ --selection-color: #FFD700; --bg-color: #464646; --dark-bg: #282828; +} +[data-theme="diamond"]{ + --primary-color: #0b304a; + --text-container: #6d9dc2; + --secondary-color: #788cac; + --text-color: #0c7080; + --next-up-text-color: #788cac; + --selection-color: #99d3ff; + --bg-color: #58a4d8; + --dark-bg: #003f5a; +} +[data-theme="masters"]{ + --primary-color: #464646; + --text-container: #444444; + --secondary-color: #c16666; + --text-color: #fce981; + --next-up-text-color: #ffe96d; + --selection-color: #FFD700; + --bg-color: #464646; + --dark-bg: #282828; +} +[data-theme="challenger"]{ + --primary-color: #464646; + --text-container: #e5383b; + --secondary-color: #ba181b; + --text-color: #0b090a; + --next-up-text-color: #161a1d; + --selection-color: #dbc858; + --bg-color: #a4161a; + --dark-bg: #2c343a; } \ No newline at end of file diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index 427a9c2..a4deaf6 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -207,6 +207,27 @@ const ThemeSelect = ({updateOptions}) => { onClick={() => changeTheme('gold')}> gold + changeTheme('diamond')}> + diamond + + changeTheme('masters')}> + masters + + changeTheme('challenger')}> + challenger + ) From 100ae8d04adb17650674b4c253cb53bf5e8d385d Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Sat, 16 Apr 2022 21:43:17 -0400 Subject: [PATCH 06/10] Added platinum, removed masters Platinum added instead of masters, themes are done --- KeyCtrl/src/App.css | 14 +++++++------- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index e63555e..031a5b3 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -300,15 +300,15 @@ --bg-color: #58a4d8; --dark-bg: #003f5a; } -[data-theme="masters"]{ +[data-theme="platinum"]{ --primary-color: #464646; --text-container: #444444; - --secondary-color: #c16666; - --text-color: #fce981; - --next-up-text-color: #ffe96d; - --selection-color: #FFD700; - --bg-color: #464646; - --dark-bg: #282828; + --secondary-color: #66c1bc; + --text-color: #81fcc9; + --next-up-text-color: #6dffda; + --selection-color: #00ffaa; + --bg-color: #435a55; + --dark-bg: #2a383f; } [data-theme="challenger"]{ --primary-color: #464646; diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index a4deaf6..6837b44 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -207,6 +207,13 @@ const ThemeSelect = ({updateOptions}) => { onClick={() => changeTheme('gold')}> gold + changeTheme('platinum')}> + platinum + { onClick={() => changeTheme('diamond')}> diamond - changeTheme('masters')}> - masters - Date: Sat, 16 Apr 2022 21:46:42 -0400 Subject: [PATCH 07/10] new diamond --- KeyCtrl/src/App.css | 4 ++-- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index 031a5b3..fb6bc63 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -297,8 +297,8 @@ --text-color: #0c7080; --next-up-text-color: #788cac; --selection-color: #99d3ff; - --bg-color: #58a4d8; - --dark-bg: #003f5a; + --bg-color: #7abfec; + --dark-bg: #c4c5ca; } [data-theme="platinum"]{ --primary-color: #464646; diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index 6837b44..47a9084 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -217,7 +217,7 @@ const ThemeSelect = ({updateOptions}) => { changeTheme('diamond')}> diamond From 468501cebd6f04cfedda4502ecd25eb66939190e Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Sat, 16 Apr 2022 21:49:52 -0400 Subject: [PATCH 08/10] challenger name change changed to -> champion --- KeyCtrl/src/App.css | 2 +- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index fb6bc63..9a652a3 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -310,7 +310,7 @@ --bg-color: #435a55; --dark-bg: #2a383f; } -[data-theme="challenger"]{ +[data-theme="champion"]{ --primary-color: #464646; --text-container: #e5383b; --secondary-color: #ba181b; diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index 47a9084..d6f5d41 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -225,8 +225,8 @@ const ThemeSelect = ({updateOptions}) => { background="#a4161a" border="#dbc858" text="#0b090a" - onClick={() => changeTheme('challenger')}> - challenger + onClick={() => changeTheme('champion')}> + champion From aa3e0450441e233c162f9a774e886d8f8fe219bd Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Tue, 19 Apr 2022 16:18:17 -0400 Subject: [PATCH 09/10] Fixed diamond --- KeyCtrl/src/App.css | 6 +++--- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index 9a652a3..07007fd 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -294,11 +294,11 @@ --primary-color: #0b304a; --text-container: #6d9dc2; --secondary-color: #788cac; - --text-color: #0c7080; + --text-color: #2e6abe; --next-up-text-color: #788cac; --selection-color: #99d3ff; - --bg-color: #7abfec; - --dark-bg: #c4c5ca; + --bg-color: #7db6fa; + --dark-bg: #243864; } [data-theme="platinum"]{ --primary-color: #464646; diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index d6f5d41..51a0874 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -215,9 +215,9 @@ const ThemeSelect = ({updateOptions}) => { platinum changeTheme('diamond')}> diamond From 4f90e6e04254b73b1a5dae24b2ffe8c8b933b3fa Mon Sep 17 00:00:00 2001 From: Maafia Desktop Date: Tue, 19 Apr 2022 16:32:04 -0400 Subject: [PATCH 10/10] Bronze adjusted colors fixed up --- KeyCtrl/src/App.css | 8 ++++---- KeyCtrl/src/components/SettingsPage/ThemeSelect.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/KeyCtrl/src/App.css b/KeyCtrl/src/App.css index 07007fd..e56c8a5 100644 --- a/KeyCtrl/src/App.css +++ b/KeyCtrl/src/App.css @@ -259,14 +259,14 @@ } [data-theme="bronze"]{ - --primary-color: #9c832f; + --primary-color: #806b27; --text-container: #3a3b2d; - --secondary-color: #6688c1; + --secondary-color: #a47e1b; --text-color: #c49515; --next-up-text-color: #db9004; --selection-color: #b67534; - --bg-color: #795c0d; - --dark-bg: #6f5006; + --bg-color: #53410e; + --dark-bg: #413f23; } [data-theme="silver"]{ diff --git a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js index 51a0874..5aea54a 100644 --- a/KeyCtrl/src/components/SettingsPage/ThemeSelect.js +++ b/KeyCtrl/src/components/SettingsPage/ThemeSelect.js @@ -187,9 +187,9 @@ const ThemeSelect = ({updateOptions}) => { wood changeTheme('bronze')}> bronze