Fix Theming

ChrisTitusTech · Sep 10, 2024 · 9abe11c · 9abe11c
1 parent 14d20cd
commit 9abe11c
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 123 deletions.
diff --git a/config/themes.json b/config/themes.json
@@ -27,19 +27,19 @@
         "MicroWinLogoSize": "10",
         "MicrowinCheckBoxMargin": "-10,5,0,0",
 
-        "ProgressBarForegroundColor": "#FFAC1C",
+        "ProgressBarForegroundColor": "#2e77ff",
         "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#000000",
-
-        "ComboBoxBackgroundColor":  "#FFFFFF",
-        "LabelboxForegroundColor":  "#000000",
-        "MainForegroundColor":  "#000000",
-        "MainBackgroundColor":  "#FFFFFF",
-        "LabelBackgroundColor":  "#FFFFFF",
-        "LinkForegroundColor":  "#000000",
-        "LinkHoverForegroundColor":  "#000000",
-        "GroupBorderBackgroundColor":  "#000000",
-        "ComboBoxForegroundColor":  "#000000",
+        "ProgressBarTextColor": "#232629",
+
+        "ComboBoxBackgroundColor":  "#F7F7F7",
+        "LabelboxForegroundColor":  "#232629",
+        "MainForegroundColor":  "#232629",
+        "MainBackgroundColor":  "#F7F7F7",
+        "LabelBackgroundColor":  "#F7F7F7",
+        "LinkForegroundColor":  "#232629",
+        "LinkHoverForegroundColor":  "#232629",
+        "GroupBorderBackgroundColor":  "#232629",
+        "ComboBoxForegroundColor":  "#232629",
 
         "ButtonFontSize":   "12",
         "ButtonFontFamily": "Arial",
@@ -52,65 +52,65 @@
         "SearchBarTextBoxFontSize":     "12",
         "SearchBarClearButtonFontSize": "14",
 
-        "ButtonInstallBackgroundColor":  "#FFFFFF",
-        "ButtonTweaksBackgroundColor":  "#FFFFFF",
-        "ButtonConfigBackgroundColor":  "#FFFFFF",
-        "ButtonUpdatesBackgroundColor":  "#FFFFFF",
-        "ButtonInstallForegroundColor":  "#000000",
-        "ButtonTweaksForegroundColor":  "#000000",
-        "ButtonConfigForegroundColor":  "#000000",
-        "ButtonUpdatesForegroundColor":  "#000000",
+        "ButtonInstallBackgroundColor":  "#F7F7F7",
+        "ButtonTweaksBackgroundColor":  "#F7F7F7",
+        "ButtonConfigBackgroundColor":  "#F7F7F7",
+        "ButtonUpdatesBackgroundColor":  "#F7F7F7",
+        "ButtonInstallForegroundColor":  "#232629",
+        "ButtonTweaksForegroundColor":  "#232629",
+        "ButtonConfigForegroundColor":  "#232629",
+        "ButtonUpdatesForegroundColor":  "#232629",
         "ButtonBackgroundColor":  "#F5F5F5",
         "ButtonBackgroundPressedColor":  "#1A1A1A",
         "CheckboxMouseOverColor": "#999999",
         "ButtonBackgroundMouseoverColor":  "#C2C2C2",
         "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#000000",
+        "ButtonForegroundColor":  "#232629",
         "ToggleButtonOnColor":  "#2e77ff",
 
         "ButtonBorderThickness":  "1",
         "ButtonMargin":  "1",
         "ButtonCornerRadius": "2",
-        "BorderColor": "#000000",
+        "BorderColor": "#232629",
         "BorderOpacity": "0.2",
         "ShadowPulse": "Forever"
     },
     "Classic": {
-        "ComboBoxBackgroundColor":  "#FFFFFF",
-        "LabelboxForegroundColor":  "#000000",
-        "MainForegroundColor":  "#000000",
-        "MainBackgroundColor":  "#FFFFFF",
-        "LabelBackgroundColor":  "#FFFFFF",
-        "LinkForegroundColor":  "#000000",
-        "LinkHoverForegroundColor":  "#000000",
-        "GroupBorderBackgroundColor":  "#000000",
-        "ComboBoxForegroundColor":  "#000000",
-
-        "ButtonInstallBackgroundColor":  "#FFFFFF",
-        "ButtonTweaksBackgroundColor":  "#FFFFFF",
-        "ButtonConfigBackgroundColor":  "#FFFFFF",
-        "ButtonUpdatesBackgroundColor":  "#FFFFFF",
-        "ButtonInstallForegroundColor":  "#000000",
-        "ButtonTweaksForegroundColor":  "#000000",
-        "ButtonConfigForegroundColor":  "#000000",
-        "ButtonUpdatesForegroundColor":  "#000000",
+        "ComboBoxBackgroundColor":  "#F7F7F7",
+        "LabelboxForegroundColor":  "#232629",
+        "MainForegroundColor":  "#232629",
+        "MainBackgroundColor":  "#F7F7F7",
+        "LabelBackgroundColor":  "#F7F7F7",
+        "LinkForegroundColor":  "#232629",
+        "LinkHoverForegroundColor":  "#232629",
+        "GroupBorderBackgroundColor":  "#232629",
+        "ComboBoxForegroundColor":  "#232629",
+
+        "ButtonInstallBackgroundColor":  "#F7F7F7",
+        "ButtonTweaksBackgroundColor":  "#F7F7F7",
+        "ButtonConfigBackgroundColor":  "#F7F7F7",
+        "ButtonUpdatesBackgroundColor":  "#F7F7F7",
+        "ButtonInstallForegroundColor":  "#232629",
+        "ButtonTweaksForegroundColor":  "#232629",
+        "ButtonConfigForegroundColor":  "#232629",
+        "ButtonUpdatesForegroundColor":  "#232629",
         "ButtonBackgroundColor":  "#F5F5F5",
         "ButtonBackgroundPressedColor":  "#1A1A1A",
         "CheckboxMouseOverColor": "#999999",
         "ButtonBackgroundMouseoverColor":  "#C2C2C2",
         "ButtonBackgroundSelectedColor":  "#F0F0F0",
-        "ButtonForegroundColor":  "#000000",
+        "ButtonForegroundColor":  "#232629",
         "ToggleButtonOnColor":  "#2e77ff"
     },
     "Matrix": {
-        "ComboBoxBackgroundColor":  "#000000",
-        "LabelboxForegroundColor":  "#FFEE58",
-        "MainForegroundColor":  "#9CCC65",
-        "MainBackgroundColor":  "#000000",
-        "LabelBackgroundColor":  "#000000",
+        "ComboBoxBackgroundColor":  "#232629",
+        "LabelboxForegroundColor":  "#81a1c1",
+        "MainForegroundColor":  "#F7F7F7",
+        "MainBackgroundColor":  "#232629",
+        "LabelBackgroundColor":  "#232629",
         "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#FFFFFF",
-        "ComboBoxForegroundColor":  "#FFEE58",
+        "LinkHoverForegroundColor":  "#F7F7F7",
+        "ComboBoxForegroundColor":  "#81a1c1",
 
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
@@ -120,30 +120,30 @@
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",
         "ButtonUpdatesBackgroundColor":  "#555555",
-        "ButtonInstallForegroundColor":  "#FFFFFF",
-        "ButtonTweaksForegroundColor":  "#FFFFFF",
-        "ButtonConfigForegroundColor":  "#FFFFFF",
-        "ButtonUpdatesForegroundColor":  "#FFFFFF",
-        "ButtonBackgroundColor":  "#000019",
-        "ButtonBackgroundPressedColor":  "#FFFFFF",
-        "ButtonBackgroundMouseoverColor":  "#A55A64",
-        "ButtonBackgroundSelectedColor":  "#FF5733",
-        "ButtonForegroundColor":  "#9CCC65",
+        "ButtonInstallForegroundColor":  "#F7F7F7",
+        "ButtonTweaksForegroundColor":  "#F7F7F7",
+        "ButtonConfigForegroundColor":  "#F7F7F7",
+        "ButtonUpdatesForegroundColor":  "#F7F7F7",
+        "ButtonBackgroundColor":  "#1E3747",
+        "ButtonBackgroundPressedColor":  "#F7F7F7",
+        "ButtonBackgroundMouseoverColor":  "#3B4252",
+        "ButtonBackgroundSelectedColor":  "#5E81AC",
+        "ButtonForegroundColor":  "#F7F7F7",
         "ToggleButtonOnColor":  "#2e77ff",
 
-        "BorderColor": "#FFAC1C",
-        "BorderOpacity": "0.8",
+        "BorderColor": "#0060CC",
+        "BorderOpacity": "0.2",
         "ShadowPulse": "0:0:3"
     },
     "Dark": {
-        "ComboBoxBackgroundColor":  "#000000",
-        "LabelboxForegroundColor":  "#FFEE58",
-        "MainForegroundColor":  "#9CCC65",
-        "MainBackgroundColor":  "#000000",
-        "LabelBackgroundColor":  "#000000",
+        "ComboBoxBackgroundColor":  "#232629",
+        "LabelboxForegroundColor":  "#81a1c1",
+        "MainForegroundColor":  "#F7F7F7",
+        "MainBackgroundColor":  "#232629",
+        "LabelBackgroundColor":  "#232629",
         "LinkForegroundColor":  "#add8e6",
-        "LinkHoverForegroundColor":  "#FFFFFF",
-        "ComboBoxForegroundColor":  "#FFEE58",
+        "LinkHoverForegroundColor":  "#F7F7F7",
+        "ComboBoxForegroundColor":  "#81a1c1",
 
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
@@ -153,17 +153,17 @@
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",
         "ButtonUpdatesBackgroundColor": "#555555",
-        "ButtonInstallForegroundColor": "#FFFFFF",
-        "ButtonTweaksForegroundColor":  "#FFFFFF",
-        "ButtonConfigForegroundColor":  "#FFFFFF",
-        "ButtonUpdatesForegroundColor": "#FFFFFF",
-        "ButtonBackgroundColor":  "#000019",
-        "ButtonBackgroundPressedColor":   "#9CCC65",
-        "ButtonBackgroundMouseoverColor": "#FF5733",
-        "ButtonBackgroundSelectedColor":  "#FF5733",
-        "ButtonForegroundColor":  "#9CCC65",
+        "ButtonInstallForegroundColor": "#F7F7F7",
+        "ButtonTweaksForegroundColor":  "#F7F7F7",
+        "ButtonConfigForegroundColor":  "#F7F7F7",
+        "ButtonUpdatesForegroundColor": "#F7F7F7",
+        "ButtonBackgroundColor":  "#1E3747",
+        "ButtonBackgroundPressedColor":   "#00CFFF",
+        "ButtonBackgroundMouseoverColor": "#5E81AC",
+        "ButtonBackgroundSelectedColor":  "#5E81AC",
+        "ButtonForegroundColor":  "#F7F7F7",
         "ToggleButtonOnColor":    "#2e77ff",
 
-        "BorderColor": "#FFAC1C"
+        "BorderColor": "#0b1215"
     }
 }
diff --git a/docs/userguide.md b/docs/userguide.md
@@ -31,8 +31,8 @@
 
 === "prefer Chocolatey"
     * Check the `prefer Chocolatey` checkbox
-    * By default Winutil will use winget to install/upgrade/remove packages and fallback to Chocolatey. This option reverses the preference. 
-    * This preference will be used for all Buttons on the Install page and persist across Winutil restarts 
+    * By default Winutil will use winget to install/upgrade/remove packages and fallback to Chocolatey. This option reverses the preference.
+    * This preference will be used for all Buttons on the Install page and persist across Winutil restarts
 
 ![Install Image](assets/Install-Tab-Dark.png#only-dark)
 ![Install Image](assets/Install-Tab-Light.png#only-light)