From e00271199a8c6449891460c8a2c7aa15c848b79e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Mar 2021 16:26:05 +0800
Subject: [PATCH] style<*>: add border for main window; changed popup
 background for dark theme; use Consolas for changes in stashes view

---
 src/Resources/Themes/Dark.xaml | 2 +-
 src/UI/Launcher.xaml           | 4 +++-
 src/UI/Stashes.xaml            | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Resources/Themes/Dark.xaml b/src/Resources/Themes/Dark.xaml
index 3d8f2017..4ad7eb62 100644
--- a/src/Resources/Themes/Dark.xaml
+++ b/src/Resources/Themes/Dark.xaml
@@ -6,7 +6,7 @@
     <SolidColorBrush x:Key="Brush.TitleBar" Color="#FF1B1B1B"/>
     <SolidColorBrush x:Key="Brush.Window" Color="#FF252525"/>
     <SolidColorBrush x:Key="Brush.NewPageHover" Color="#FF404040"/>
-    <SolidColorBrush x:Key="Brush.Popup" Color="#FF252525"/>
+    <SolidColorBrush x:Key="Brush.Popup" Color="#FF2B2B2B"/>
     <SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/>
     <SolidColorBrush x:Key="Brush.Badge" Color="#FF8F8F8F"/>
     <SolidColorBrush x:Key="Brush.CommitViewer" Color="#FF222222"/>
diff --git a/src/UI/Launcher.xaml b/src/UI/Launcher.xaml
index 15d2b780..7f98b858 100644
--- a/src/UI/Launcher.xaml
+++ b/src/UI/Launcher.xaml
@@ -21,7 +21,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Layout -->
-    <Border>
+    <Border BorderBrush="{StaticResource Brush.Border3}">
 
         <!-- Fix Maximize BUG -->
         <Border.Style>
@@ -29,9 +29,11 @@
                 <Style.Triggers>
                     <DataTrigger Binding="{Binding WindowState, ElementName=me}" Value="Maximized">
                         <Setter Property="Margin" Value="{x:Static local:Launcher.MAXIMIZE_MARGIN}"/>
+                        <Setter Property="BorderThickness" Value="0"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding WindowState, ElementName=me}" Value="Normal">
                         <Setter Property="Margin" Value="0"/>
+                        <Setter Property="BorderThickness" Value="1"/>
                     </DataTrigger>
                 </Style.Triggers>
             </Style>
diff --git a/src/UI/Stashes.xaml b/src/UI/Stashes.xaml
index ad2600a6..c048afb3 100644
--- a/src/UI/Stashes.xaml
+++ b/src/UI/Stashes.xaml
@@ -101,6 +101,7 @@
                     <ListView.ItemContainerStyle>
                         <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource Style.ListViewItem.Borderless}">
                             <Setter Property="Padding" Value="0"/>
+                            <Setter Property="TextBlock.FontFamily" Value="Consolas"/>
                         </Style>
                     </ListView.ItemContainerStyle>
                     <ListView.ItemTemplate>