From 08dc0397686cecd9e171cc5c7e2ea8f423c72ada Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Aug 2020 11:08:58 +0800
Subject: [PATCH] style(Conflict): better color for conflicts detected tool bar

---
 SourceGit/Resources/Themes/Dark.xaml  | 1 +
 SourceGit/Resources/Themes/Light.xaml | 1 +
 SourceGit/UI/Dashboard.xaml           | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SourceGit/Resources/Themes/Dark.xaml b/SourceGit/Resources/Themes/Dark.xaml
index 2f8cac59..31eeb7ae 100644
--- a/SourceGit/Resources/Themes/Dark.xaml
+++ b/SourceGit/Resources/Themes/Dark.xaml
@@ -7,6 +7,7 @@
     <SolidColorBrush x:Key="Brush.BG4" Color="#FF303030"/>
     <SolidColorBrush x:Key="Brush.BG5" Color="#FF505050"/>
     <SolidColorBrush x:Key="Brush.BG6" Color="#FF404040"/>
+    <SolidColorBrush x:Key="Brush.BG7" Color="#FFFAFAD2"/>
     <SolidColorBrush x:Key="Brush.Border1" Color="#FF7C7C7C"/>
     <SolidColorBrush x:Key="Brush.Border2" Color="#FF404040"/>
     <SolidColorBrush x:Key="Brush.FG" Color="#FFF1F1F1"/>
diff --git a/SourceGit/Resources/Themes/Light.xaml b/SourceGit/Resources/Themes/Light.xaml
index 2d936bb2..ad3a3aaa 100644
--- a/SourceGit/Resources/Themes/Light.xaml
+++ b/SourceGit/Resources/Themes/Light.xaml
@@ -6,6 +6,7 @@
     <SolidColorBrush x:Key="Brush.BG4" Color="#FFE6E7E8"/>
     <SolidColorBrush x:Key="Brush.BG5" Color="#FFBDBDBD"/>
     <SolidColorBrush x:Key="Brush.BG6" Color="#FFCFCFCF"/>
+    <SolidColorBrush x:Key="Brush.BG7" Color="#FF836C2E"/>
     <SolidColorBrush x:Key="Brush.Border1" Color="#FF898989"/>
     <SolidColorBrush x:Key="Brush.Border2" Color="#FFCFCFCF"/>
     <SolidColorBrush x:Key="Brush.FG" Color="#FF1F1F1F"/>
diff --git a/SourceGit/UI/Dashboard.xaml b/SourceGit/UI/Dashboard.xaml
index 4c749597..0afc3c17 100644
--- a/SourceGit/UI/Dashboard.xaml
+++ b/SourceGit/UI/Dashboard.xaml
@@ -493,7 +493,7 @@
                 </Grid.RowDefinitions>
 
                 <!-- Abort panel -->
-                <Grid x:Name="abortPanel" Grid.Row="0" Background="LightGoldenrodYellow" Visibility="Collapsed">
+                <Grid x:Name="abortPanel" Grid.Row="0" Background="{StaticResource Brush.BG7}" Visibility="Collapsed">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>