From 14f905dbfd09846023919c4d52501e0dbc6b9c4b Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Sun, 8 Nov 2020 14:41:51 +0100
Subject: [PATCH] Updates themes

---
 src/modules/imageresizer/ui/Themes/Dark.xaml         |  7 -------
 .../imageresizer/ui/Themes/HighContrast1.xaml        | 11 ++---------
 .../imageresizer/ui/Themes/HighContrast2.xaml        | 11 ++---------
 .../imageresizer/ui/Themes/HighContrastBlack.xaml    | 12 ++----------
 .../imageresizer/ui/Themes/HighContrastWhite.xaml    | 12 ++----------
 src/modules/imageresizer/ui/Themes/Light.xaml        | 12 ++----------
 6 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/src/modules/imageresizer/ui/Themes/Dark.xaml b/src/modules/imageresizer/ui/Themes/Dark.xaml
index 2d18580052..102f6a3529 100644
--- a/src/modules/imageresizer/ui/Themes/Dark.xaml
+++ b/src/modules/imageresizer/ui/Themes/Dark.xaml
@@ -17,13 +17,6 @@
 
     <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" />
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="WindowBorderBrush" Color="#FF535353"/>
-    <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a"/>
-
-    <SolidColorBrush x:Key="ListViewPointerOverBrush" Color="#FF242424"/>
-    <SolidColorBrush x:Key="ListViewPressedBrush" Color="#FF333333"/>
-
-    <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FF454545"/>
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF999999" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrast1.xaml b/src/modules/imageresizer/ui/Themes/HighContrast1.xaml
index d19932cf9d..84d293c7e8 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrast1.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrast1.xaml
@@ -15,15 +15,8 @@
     <system:String x:Key="Theme.ColorScheme">Accent2</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
-    <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
-    <SolidColorBrush x:Key="WindowBorderBrush" Color="#FFffff00"/>
-    <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a"/>
-
-    <SolidColorBrush x:Key="ListViewPointerOverBrush" Color="#FF242424"/>
-    <SolidColorBrush x:Key="ListViewPressedBrush" Color="#FF333333"/>
-
-    <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FF454545"/>
+    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" />
+    <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF00ff00" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrast2.xaml b/src/modules/imageresizer/ui/Themes/HighContrast2.xaml
index 8d21136102..80570204d7 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrast2.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrast2.xaml
@@ -15,16 +15,9 @@
     <system:String x:Key="Theme.ColorScheme">Accent3</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
-    <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
-    <SolidColorBrush x:Key="WindowBorderBrush" Color="#FF00ff00"/>
-    <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a"/>
-
-    <SolidColorBrush x:Key="ListViewPointerOverBrush" Color="#FF242424"/>
-    <SolidColorBrush x:Key="ListViewPressedBrush" Color="#FF333333"/>
-
-    <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FF454545"/>
 
+    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" />
+    <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF00ff00" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FFc0c0c0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml b/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
index 4ee3b468da..9732896956 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
@@ -15,16 +15,8 @@
     <system:String x:Key="Theme.ColorScheme">Accent4</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
-    <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
-    <SolidColorBrush x:Key="WindowBorderBrush" Color="#FFffffff"/>
-    <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a"/>
-
-    <SolidColorBrush x:Key="ListViewPointerOverBrush" Color="#FF242424"/>
-    <SolidColorBrush x:Key="ListViewPressedBrush" Color="#FF333333"/>
-
-    <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FF454545"/>
-
+    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" />
+    <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffffff" />
     <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF1aebff" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml b/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
index c46506d58e..0804cf4f0b 100644
--- a/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
+++ b/src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
@@ -15,16 +15,8 @@
     <system:String x:Key="Theme.ColorScheme">Accent5</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFededed" />
+    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFe6e6e6" />
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="WindowBorderBrush" Color="Black"/>
-    <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF949494"/>
-
-    <SolidColorBrush x:Key="ListViewPointerOverBrush" Color="#e9e9e9"/>
-    <SolidColorBrush x:Key="ListViewPressedBrush" Color="#FFe5e5e5"/>
-
-    <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FFf9f9f9"/>
-
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF37006e" />
+    <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Themes/Light.xaml b/src/modules/imageresizer/ui/Themes/Light.xaml
index 68f4d643e7..986e54eb71 100644
--- a/src/modules/imageresizer/ui/Themes/Light.xaml
+++ b/src/modules/imageresizer/ui/Themes/Light.xaml
@@ -15,16 +15,8 @@
     <system:String x:Key="Theme.ColorScheme">Accent1</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFededed" />
+    <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFe6e6e6" />
     <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="WindowBorderBrush" Color="#FFf7f7f7"/>
-    <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF949494"/>
-
-    <SolidColorBrush x:Key="ListViewPointerOverBrush" Color="#e9e9e9"/>
-    <SolidColorBrush x:Key="ListViewPressedBrush" Color="#FFe5e5e5"/>
-
-    <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FFf9f9f9"/>
-
     <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF949494" />
+    <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" />
 </ResourceDictionary>
\ No newline at end of file