From 9a56ebea81edb4952d90842d5b0f98054cdc3a57 Mon Sep 17 00:00:00 2001
From: Boris Makogonyuk <madrivus@gmail.com>
Date: Tue, 10 Nov 2015 06:54:23 +0100
Subject: [PATCH] Black and White Themes updated and staged

---
 ...{SimpleBlur.xaml => SimpleBlur-Black.xaml} | 22 ++++++--
 Wox/Themes/SimpleBlur-White.xaml              | 55 +++++++++++++++++++
 2 files changed, 71 insertions(+), 6 deletions(-)
 rename Wox/Themes/{SimpleBlur.xaml => SimpleBlur-Black.xaml} (71%)
 create mode 100644 Wox/Themes/SimpleBlur-White.xaml

diff --git a/Wox/Themes/SimpleBlur.xaml b/Wox/Themes/SimpleBlur-Black.xaml
similarity index 71%
rename from Wox/Themes/SimpleBlur.xaml
rename to Wox/Themes/SimpleBlur-Black.xaml
index ff136a15d2..fad01abd7a 100644
--- a/Wox/Themes/SimpleBlur.xaml
+++ b/Wox/Themes/SimpleBlur-Black.xaml
@@ -9,37 +9,47 @@
     <system:Int32 x:Key="WindowsAccentMode">3</system:Int32>
     
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
+		<Setter Property="Foreground" Value="#FFFFFFFF" />
+		<Setter Property="Background" Value="#01000001" />
     </Style>
     
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="Transparent" />
-        <!--<Setter Property="Background" Value="#80FFFFFF" />-->
+        <Setter Property="Background" Value="#CC000000" />
+		<Setter Property="BorderBrush" Value="#50FFFFFF" /> 
+		<Setter Property="BorderThickness" Value="10" />
+		
         
     </Style>
     
     <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
-        <Setter Property="Background" Value="Transparent"></Setter>
-    </Style>
+        <Setter Property="Background" Value="#01000001"></Setter>
+    </Style>  
 
     <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
     </Style>
 
     <!-- Item Style -->
     <Style x:Key="ItemTitleStyle"  BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
+		<Setter Property="Margin" Value="0, -10"/>
+		<Setter Property="Foreground" Value="#FFFFFFFF"/>
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
+		<Setter Property="Foreground" Value="#FFFFFFFF"/>
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
+		<Setter Property="Margin" Value="0, -10"/>
+		<Setter Property="Foreground" Value="#FFFFFFFF"/>
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
+		<Setter Property="Foreground" Value="#FFFFFFFF"/>
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#4F6180</Color>
+    <Color x:Key="ItemSelectedBackgroundColor">#356ef3</Color>
 
     <!-- button style in the middle of the scrollbar -->
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
     </Style>
 
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
-       
+       <Setter Property="Background" Value="#a0a0a0"/>
     </Style>
 </ResourceDictionary>
diff --git a/Wox/Themes/SimpleBlur-White.xaml b/Wox/Themes/SimpleBlur-White.xaml
new file mode 100644
index 0000000000..f502115e85
--- /dev/null
+++ b/Wox/Themes/SimpleBlur-White.xaml
@@ -0,0 +1,55 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    
+    <!-- Windows Accent Mode: 0 - none, 1 - Accent color, 2 - Accent with transparency, 3 - Blur -->
+    <system:Int32 x:Key="WindowsAccentMode">3</system:Int32>
+    
+    <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
+		<Setter Property="Foreground" Value="#FF000000" />
+		<Setter Property="Background" Value="#01FFFFFF" />
+    </Style>
+    
+    <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
+        <Setter Property="Background" Value="#CCFFFFFF" />
+		<Setter Property="BorderBrush" Value="#70000000" /> 
+		<Setter Property="BorderThickness" Value="10" />
+		
+        
+    </Style>
+    
+    <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
+        <Setter Property="Background" Value="#01FFFFFF"></Setter>
+    </Style>  
+
+    <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
+    </Style>
+
+    <!-- Item Style -->
+    <Style x:Key="ItemTitleStyle"  BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
+		<Setter Property="Margin" Value="0, -10"/>
+		<Setter Property="Foreground" Value="#FF000000"/>
+    </Style>
+    <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
+		<Setter Property="Foreground" Value="#FF000000"/>
+    </Style>
+    <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
+		<Setter Property="Margin" Value="0, -10"/>
+		<Setter Property="Foreground" Value="#FFFFFFFF"/>
+    </Style>
+    <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
+		<Setter Property="Foreground" Value="#FFFFFFFF"/>
+    </Style>
+    <Color x:Key="ItemSelectedBackgroundColor">#356ef3</Color>
+
+    <!-- button style in the middle of the scrollbar -->
+    <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
+    </Style>
+
+    <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
+       <Setter Property="Background" Value="#a0a0a0"/>
+    </Style>
+</ResourceDictionary>