From 1bdc4f91afaea61a4fa0e296e9b0459afd37368a Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Wed, 12 Aug 2020 08:06:43 +0800
Subject: [PATCH] =?UTF-8?q?<style>(<*>):=20=20=E5=AE=8C=E5=96=84Tab?=
 =?UTF-8?q?=E7=9A=84=E9=98=B4=E5=BD=B1=E6=95=88=E6=9E=9C=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20Merge=20=E6=8F=90=E7=A4=BA=E6=A1=86=20=E5=92=8C=20?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=A1=86=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=94=AE=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/Dashboard.xaml | 6 +++---
 src/UI/Launcher.xaml  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/UI/Dashboard.xaml b/src/UI/Dashboard.xaml
index bbde65c4..c044162f 100644
--- a/src/UI/Dashboard.xaml
+++ b/src/UI/Dashboard.xaml
@@ -503,7 +503,7 @@
 
                     <Label Grid.Column="0" x:Name="txtMergeProcessing" FontWeight="DemiBold" Foreground="{StaticResource Brush.BG4}"/>
                     <StackPanel Grid.Column="1" Orientation="Horizontal">
-                        <Button x:Name="btnResolve" Click="Resolve" Content="RESOLVE" Margin="4">
+                        <Button x:Name="btnResolve" Click="Resolve" Content="RESOLVE" Margin="2">
                             <Button.Style>
                                 <Style TargetType="{x:Type Button}" BasedOn="{StaticResource Style.Button.Bordered}">
                                     <Setter Property="Background" Value="{StaticResource Brush.BG1}"/>
@@ -511,8 +511,8 @@
                                 </Style>
                             </Button.Style>
                         </Button>
-                        <Button x:Name="btnContinue" Click="Continue" Content="CONTINUE" Style="{StaticResource Style.Button.AccentBordered}" Margin="4"/>
-                        <Button Grid.Column="3" Click="Abort" Content="ABORT" Style="{StaticResource Style.Button.Bordered}" Foreground="{StaticResource Brush.BG1}" Margin="4"/>
+                        <Button x:Name="btnContinue" Click="Continue" Content="CONTINUE" Style="{StaticResource Style.Button.AccentBordered}" Margin="2"/>
+                        <Button Grid.Column="3" Click="Abort" Content="ABORT" Style="{StaticResource Style.Button.Bordered}" Foreground="{StaticResource Brush.BG1}" Margin="2"/>
                     </StackPanel>
                     
                 </Grid>
diff --git a/src/UI/Launcher.xaml b/src/UI/Launcher.xaml
index 28011750..0181c48a 100644
--- a/src/UI/Launcher.xaml
+++ b/src/UI/Launcher.xaml
@@ -80,7 +80,7 @@
                                             <Grid x:Name="Container" Opacity=".7" SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True">
                                                 <Border x:Name="BG" SnapsToDevicePixels="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
                                                     <Border.Effect>
-                                                        <DropShadowEffect ShadowDepth="2" Direction="30" Color="Black" Opacity=".3"/>
+                                                        <DropShadowEffect BlurRadius="8" ShadowDepth="0" Direction="270" Opacity=".5"/>
                                                     </Border.Effect>
                                                 </Border>
 
@@ -277,6 +277,7 @@
                                         Grid.Row="2"
                                         Margin="4,0"
                                         Click="RemoveError"
+                                        Height="25"
                                         Content="CLOSE"
                                         Style="{StaticResource Style.Button.AccentBordered}"
                                         BorderBrush="{StaticResource Brush.FG}"