From 03a291a309d3bce762110bef38572d9fe812ca04 Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc+github@gmail.com>
Date: Mon, 29 Aug 2016 13:13:27 +0100
Subject: [PATCH] Switched back to Office 2013 theme now that it's fixed on
 Windows 10. Slightly increased with of Block Item user controls.

---
 Filtration.db                                 | Bin 4096 -> 4096 bytes
 Filtration/App.xaml                           |   7 ++++---
 Filtration/Properties/AssemblyInfo.cs         |   2 +-
 Filtration/UserControls/BlockItemControl.xaml |   4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Filtration.db b/Filtration.db
index e79f87a09dbc1f1f12d305a510abd170f50421cf..05e0664c76a3569d5a20542a584d69c10b0e89c1 100644
GIT binary patch
delta 17
YcmZorXi%6S%_ulg#+gxYW5NP{04jC_zyJUM

delta 17
YcmZorXi%6S%_uNY#+gxIW5NP{04iq$z5oCK

diff --git a/Filtration/App.xaml b/Filtration/App.xaml
index 38f56c3..3161653 100644
--- a/Filtration/App.xaml
+++ b/Filtration/App.xaml
@@ -8,9 +8,10 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Filtration.Common;component/Styles/SharedResourcesDictionary.xaml" />
                 
-                <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/windows8/silver.xaml" />
-                <!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Office2013/Generic.xaml" />-->
+                <!--<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />-->
+                <!--<ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/windows8/Generic.xaml" />-->
+                <!--<ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/windows8/silver.xaml" />-->
+                <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Office2013/Generic.xaml" />
                 <ResourceDictionary Source="Views/Styles/Colours.xaml" />
                 <ResourceDictionary Source="Views/Styles/CheckBox.xaml" />
                 <ResourceDictionary Source="Views/Styles/ListBoxItem.xaml" />
diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index 895ffe2..3f4b255 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -50,7 +50,7 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.11")]
+[assembly: AssemblyVersion("0.12")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]
diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml
index 303aee6..3935e21 100644
--- a/Filtration/UserControls/BlockItemControl.xaml
+++ b/Filtration/UserControls/BlockItemControl.xaml
@@ -12,8 +12,8 @@
              xmlns:views="clr-namespace:Filtration.Views"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=userControls:BlockItemControl}"
-             d:DesignHeight="200" d:DesignWidth="150">
-    <Border Style="{StaticResource BlockItemBorder}" Width="142">
+             d:DesignHeight="200" d:DesignWidth="160">
+    <Border Style="{StaticResource BlockItemBorder}" Width="150">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />