Merge pull request #176 from haevg-rz/Style

Style
haevg-rz · Jul 24, 2020 · f2bb989 · f2bb989
2 parents 4a6d326 + 99a21b3
commit f2bb989
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 38 deletions.
diff --git 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" />
@@ -267,9 +267,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
@@ -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/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" /> -->

diff --git a/...ion/Resources/Styles/TextBlockStyles.xaml → ...ation/Resources/Styles/TextBoxStyles.xaml b/...ion/Resources/Styles/TextBlockStyles.xaml → ...ation/Resources/Styles/TextBoxStyles.xaml
@@ -2,14 +2,14 @@
                     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"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="FontSize" Value="16"/>
         <Setter Property="Width" Value="auto"/>
-    </Style>
+    </Style>-->
 
 </ResourceDictionary>