From 5c7aa1a692b3aa6680678432a2526394c95568fb Mon Sep 17 00:00:00 2001
From: Leo Ecker <Leo.Ecker@edu.fhdw.de>
Date: Fri, 24 Jul 2020 08:16:30 +0200
Subject: [PATCH 1/2] #125 delete and rename Styles

---
 .../MainWindow.xaml                           |  7 ++---
 .../Resources/Styles/LabelStyles.xaml         | 30 -------------------
 ...extBlockStyles.xaml => TextBoxStyles.xaml} |  4 +--
 3 files changed, 4 insertions(+), 37 deletions(-)
 rename TrustCenterSearch.Presentation/Resources/Styles/{TextBlockStyles.xaml => TextBoxStyles.xaml} (89%)

diff --git a/TrustCenterSearch.Presentation/MainWindow.xaml b/TrustCenterSearch.Presentation/MainWindow.xaml
index 5f1e564..2670278 100644
--- a/TrustCenterSearch.Presentation/MainWindow.xaml
+++ b/TrustCenterSearch.Presentation/MainWindow.xaml
@@ -21,7 +21,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Resources/Styles/ButtonStyles.xaml" />
                 <ResourceDictionary Source="Resources/Styles/IconStyles.xaml" />
-                <ResourceDictionary Source="Resources/Styles/TextBlockStyles.xaml" />
+                <ResourceDictionary Source="Resources/Styles/TextBoxStyles.xaml" />
                 <ResourceDictionary Source="Resources/Styles/LoadingAnimationStyle.xaml" />
                 <ResourceDictionary Source="Resources/Styles/LabelStyles.xaml" />
                 <ResourceDictionary Source="Resources/Styles/BorderStyle.xaml" />
@@ -164,7 +164,6 @@
             </ItemsControl.Template>
 
         </ItemsControl>
-        <!-- </Border> -->
         <!-- Search results -->
 
 
@@ -262,9 +261,7 @@
                                     </ItemsControl.ItemsPanel>
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate DataType="{x:Type models:TrustCenterMetaInfo}">
-                                            <Border HorizontalAlignment="Left" Padding="2" Width="245" Height="32"
-                                                    Margin="4,2,0,2" BorderBrush="Transparent" BorderThickness="0.8"
-                                                    CornerRadius="3" Background="#d9e9ff">
+                                            <Border Style="{StaticResource AktiveFilterBorder}">
                                                 <WrapPanel Margin="2" Background="Transparent">
                                                     <Button Style="{DynamicResource RemoveIconStyle}"
                                                             CommandParameter="{Binding}"
diff --git a/TrustCenterSearch.Presentation/Resources/Styles/LabelStyles.xaml b/TrustCenterSearch.Presentation/Resources/Styles/LabelStyles.xaml
index 1656f8c..851943b 100644
--- a/TrustCenterSearch.Presentation/Resources/Styles/LabelStyles.xaml
+++ b/TrustCenterSearch.Presentation/Resources/Styles/LabelStyles.xaml
@@ -2,36 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:TrustCenterSearch.Presentation.Resources.Styles">
 
-    <!--Search Results--> 
-
-    <!--SearchResult Base Style-->
-    <Style TargetType="Label" x:Key="SearchResultLabelStyle">
-        <Setter Property="BorderThickness" Value ="0"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="FontSize" Value="16"/>
-        <Setter Property="Foreground" Value="Gray"/>
-    </Style>
-    <!--SearchResult Base Style-->
-
-    <Style TargetType="Label" x:Key="SearchResultTrustCenterNameLabelStyle">
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-        <Setter Property="Foreground" Value="#a5c5f0"/>
-        <Setter Property="FontSize" Value="12"/>
-    </Style>
-
-    <Style TargetType="Label" x:Key="SearchResultThumbprintLabelStyle" BasedOn="{StaticResource SearchResultLabelStyle}">
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="Width" Value="100"/>
-        <Setter Property="Content" Value="SearchResultThumbprintLabelStyle"/>
-    </Style>
-
-    <Style TargetType="Label" x:Key="SearchResultKeyLengthLabelStyle" BasedOn="{StaticResource SearchResultLabelStyle}">
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="Content" Value="Public Key length:"/> 
-        <Setter Property="Width" Value="Auto"/>
-    </Style>
-    <!--Search Results-->
-
     <!--Add TrustCenter-->
     <Style TargetType="Label" x:Key="MenuTitleLabelStyle">
         <Setter Property="Content" Value="Trust Center Search GUI"/>
diff --git a/TrustCenterSearch.Presentation/Resources/Styles/TextBlockStyles.xaml b/TrustCenterSearch.Presentation/Resources/Styles/TextBoxStyles.xaml
similarity index 89%
rename from TrustCenterSearch.Presentation/Resources/Styles/TextBlockStyles.xaml
rename to TrustCenterSearch.Presentation/Resources/Styles/TextBoxStyles.xaml
index 4a9911f..b70cb39 100644
--- a/TrustCenterSearch.Presentation/Resources/Styles/TextBlockStyles.xaml
+++ b/TrustCenterSearch.Presentation/Resources/Styles/TextBoxStyles.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:TrustCenterSearch.Presentation.Resources.Styles">
 
-    <Style TargetType="TextBox" x:Key="SearchResultTextBox">
+    <!--<Style TargetType="TextBox" x:Key="SearchResultTextBox">
         <Setter Property="IsReadOnly" Value="True"/>
         <Setter Property="BorderThickness" Value ="0"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
@@ -10,6 +10,6 @@
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="FontSize" Value="16"/>
         <Setter Property="Width" Value="auto"/>
-    </Style>
+    </Style>-->
 
 </ResourceDictionary>
\ No newline at end of file

From 4d169bc58fda638f0f3fd4439f4847b7533bcc0b Mon Sep 17 00:00:00 2001
From: Leo Ecker <Leo.Ecker@edu.fhdw.de>
Date: Fri, 24 Jul 2020 13:22:01 +0200
Subject: [PATCH 2/2] #125 Rename and Delete Styles

---
 .../Resources/Styles/LoadingAnimationStyle.xaml                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/TrustCenterSearch.Presentation/Resources/Styles/LoadingAnimationStyle.xaml b/TrustCenterSearch.Presentation/Resources/Styles/LoadingAnimationStyle.xaml
index 6372455..4a4c554 100644
--- a/TrustCenterSearch.Presentation/Resources/Styles/LoadingAnimationStyle.xaml
+++ b/TrustCenterSearch.Presentation/Resources/Styles/LoadingAnimationStyle.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:TrustCenterSearch.Presentation.Resources.Styles">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!-- <Color x:Key="FilledColor" A="255" B="155" R="155" G="155" /> -->
     <!-- <Color x:Key="UnfilledColor" A="0" B="155" R="155" G="155" /> -->