From d32563aebd30732088c86c45395663c6c828b326 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 18 Jun 2021 15:41:47 +0800
Subject: [PATCH] style<Decorators>: change font and color for commit
 decorators

---
 src/Resources/Themes/Dark.xaml      | 1 +
 src/Resources/Themes/Light.xaml     | 3 ++-
 src/Views/Widgets/CommitDetail.xaml | 4 ++--
 src/Views/Widgets/Histories.xaml    | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Themes/Dark.xaml b/src/Resources/Themes/Dark.xaml
index 05abc731..8c4de3f8 100644
--- a/src/Resources/Themes/Dark.xaml
+++ b/src/Resources/Themes/Dark.xaml
@@ -12,6 +12,7 @@
     <SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/>
     <SolidColorBrush x:Key="Brush.Badge" Color="#FF8F8F8F"/>
     <SolidColorBrush x:Key="Brush.Decorator" Color="#FF505050"/>
+    <SolidColorBrush x:Key="Brush.DecoratorIcon" Color="#FFF8F8F8"/>
     <SolidColorBrush x:Key="Brush.Conflict" Color="#FFFAFAD2"/>
 
     <SolidColorBrush x:Key="Brush.Border0" Color="#FF101010"/>
diff --git a/src/Resources/Themes/Light.xaml b/src/Resources/Themes/Light.xaml
index a5fd12c8..ac05e195 100644
--- a/src/Resources/Themes/Light.xaml
+++ b/src/Resources/Themes/Light.xaml
@@ -11,7 +11,8 @@
     <SolidColorBrush x:Key="Brush.Popup" Color="#FFF8F8F8"/>
     <SolidColorBrush x:Key="Brush.Contents" Color="White"/>
     <SolidColorBrush x:Key="Brush.Badge" Color="#FFAFAFAF"/>
-    <SolidColorBrush x:Key="Brush.Decorator" Color="#FFBDBDBD"/>
+    <SolidColorBrush x:Key="Brush.Decorator" Color="#FF6F6F6F"/>
+    <SolidColorBrush x:Key="Brush.DecoratorIcon" Color="#FFF8F8F8"/>
     <SolidColorBrush x:Key="Brush.Conflict" Color="#FF836C2E"/>
 
     <SolidColorBrush x:Key="Brush.Border0" Color="#FFCFCFCF"/>
diff --git a/src/Views/Widgets/CommitDetail.xaml b/src/Views/Widgets/CommitDetail.xaml
index b4b1c95e..a4400a15 100644
--- a/src/Views/Widgets/CommitDetail.xaml
+++ b/src/Views/Widgets/CommitDetail.xaml
@@ -139,11 +139,11 @@
                             <DataTemplate DataType="{x:Type models:Decorator}">
                                 <StackPanel Orientation="Horizontal" Height="16" Margin="2,0">
                                     <Border Background="{StaticResource Brush.Decorator}">
-                                        <Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}"/>
+                                        <Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}" Fill="{StaticResource Brush.DecoratorIcon}"/>
                                     </Border>
 
                                     <Border x:Name="Color" Background="#FFFFB835">
-                                        <TextBlock Text="{Binding Name}" FontSize="8pt" Margin="4,0" Foreground="Black"/>
+                                        <TextBlock Text="{Binding Name}" FontSize="8pt" Margin="4,0" Foreground="Black" FontFamily="Consolas"/>
                                     </Border>
                                 </StackPanel>
 
diff --git a/src/Views/Widgets/Histories.xaml b/src/Views/Widgets/Histories.xaml
index 95235489..122f8320 100644
--- a/src/Views/Widgets/Histories.xaml
+++ b/src/Views/Widgets/Histories.xaml
@@ -73,11 +73,11 @@
                                                 <DataTemplate DataType="{x:Type models:Decorator}">
                                                     <StackPanel Orientation="Horizontal" Height="16" Margin="2,0">
                                                         <Border Background="{StaticResource Brush.Decorator}">
-                                                            <Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}"/>
+                                                            <Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}" Fill="{StaticResource Brush.DecoratorIcon}"/>
                                                         </Border>
 
                                                         <Border x:Name="Color" Background="#FFFFB835">
-                                                            <TextBlock Text="{Binding Name}" FontSize="8pt" Margin="4,0" Foreground="Black"/>
+                                                            <TextBlock Text="{Binding Name}" FontSize="8pt" Margin="4,0" Foreground="Black" FontFamily="Consolas"/>
                                                         </Border>
                                                     </StackPanel>