From ed911fb679eac743da1b3bd4292708884ddf1779 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 1 Feb 2021 10:18:56 +0800
Subject: [PATCH] style<Dashboard>: toolbar style

---
 src/Resources/Locales/en_US.xaml |  2 +-
 src/UI/Dashboard.xaml            | 34 ++++++++++++++++----------------
 src/UI/Push.xaml                 |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index 8be16e7f..904bf9f1 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -23,7 +23,7 @@
     <sys:String x:Key="Text.About">ABOUT</sys:String>
     <sys:String x:Key="Text.About.Title">SourceGit - OPEN SOURCE GIT CLIENT</sys:String>
 
-    <sys:String x:Key="Text.Apply">Apply</sys:String>
+    <sys:String x:Key="Text.Apply">Patch</sys:String>
     <sys:String x:Key="Text.Apply.Title">Apply Patch</sys:String>
     <sys:String x:Key="Text.Apply.File">Patch File :</sys:String>
     <sys:String x:Key="Text.Apply.File.Placeholder">Select .patch file to apply</sys:String>
diff --git a/src/UI/Dashboard.xaml b/src/UI/Dashboard.xaml
index e75339f1..5e4d30bf 100644
--- a/src/UI/Dashboard.xaml
+++ b/src/UI/Dashboard.xaml
@@ -62,35 +62,35 @@
                 </StackPanel>
                 
                 <!-- Common Git Options -->
-                <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="6,0">
-                    <Button Click="OpenFetch" Margin="4,0">
-                        <StackPanel Orientation="Horizontal">
+                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                    <Button Click="OpenFetch" Style="{StaticResource Style.Button.HighlightHover}">
+                        <StackPanel Orientation="Horizontal" Margin="6,0">
                             <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Fetch}"/>
-                            <Label Content="{StaticResource Text.Fetch}"/>
+                            <Label Content="{StaticResource Text.Fetch}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenPull" Margin="4,0">
-                        <StackPanel Orientation="Horizontal">
+                    <Button Click="OpenPull" Style="{StaticResource Style.Button.HighlightHover}">
+                        <StackPanel Orientation="Horizontal" Margin="6,0">
                             <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Pull}"/>
-                            <Label Content="{StaticResource Text.Pull}"/>
+                            <Label Content="{StaticResource Text.Pull}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenPush" Margin="4,0">
-                        <StackPanel Orientation="Horizontal">
+                    <Button Click="OpenPush" Style="{StaticResource Style.Button.HighlightHover}">
+                        <StackPanel Orientation="Horizontal" Margin="6,0">
                             <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Push}"/>
-                            <Label Content="{StaticResource Text.Push}"/>
+                            <Label Content="{StaticResource Text.Push}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenStash" Margin="4,0">
-                        <StackPanel Orientation="Horizontal">
+                    <Button Click="OpenStash" Style="{StaticResource Style.Button.HighlightHover}">
+                        <StackPanel Orientation="Horizontal" Margin="6,0">
                             <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.SaveStash}"/>
-                            <Label Content="{StaticResource Text.Stash}"/>
+                            <Label Content="{StaticResource Text.Stash}" Margin="4,0,0,0"/>
                         </StackPanel>
-                    </Button>                    
-                    <Button Click="OpenApply">
-                        <StackPanel Orientation="Horizontal">
+                    </Button>
+                    <Button Click="OpenApply" Style="{StaticResource Style.Button.HighlightHover}">
+                        <StackPanel Orientation="Horizontal" Margin="6,0">
                             <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Apply}"/>
-                            <Label Content="{StaticResource Text.Apply}"/>
+                            <Label Content="{StaticResource Text.Apply}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/UI/Push.xaml b/src/UI/Push.xaml
index 4103d931..447d8f96 100644
--- a/src/UI/Push.xaml
+++ b/src/UI/Push.xaml
@@ -24,7 +24,7 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
-        <Label Grid.Row="0" Grid.ColumnSpan="2" FontWeight="DemiBold" FontSize="18" Content="{StaticResource Text.Push.Local}"/>
+        <Label Grid.Row="0" Grid.ColumnSpan="2" FontWeight="DemiBold" FontSize="18" Content="{StaticResource Text.Push.Title}"/>
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Content="{StaticResource Text.Push.Local}"/>
         <ComboBox Grid.Row="2" Grid.Column="1"