From d3042bbe8d464d8c0270b336dd834270ba8b07b3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 22 Jun 2024 19:35:15 +0800
Subject: [PATCH] ux: style for buttons in conflict bar

---
 src/Resources/Styles.axaml        |  2 --
 src/Views/InteractiveRebase.axaml |  2 +-
 src/Views/Repository.axaml        | 28 +++++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 988175b9..36be8895 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -421,14 +421,12 @@
       <ControlTemplate>
         <Grid>
           <Border x:Name="PART_Border"
-                  Margin="2"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
                   CornerRadius="{TemplateBinding CornerRadius}"/>
 
           <ContentPresenter x:Name="PART_ContentPresenter"
-                            Margin="2"
                             Background="Transparent"
                             Padding="{TemplateBinding Padding}"
                             Content="{TemplateBinding Content}"
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index bca76d1f..64e66bd5 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -295,7 +295,7 @@
                    Maximum="100"
                    IsVisible="False"/>
       <Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="StartJobs"/>
-      <Button Grid.Column="2" Classes="flat" MinWidth="80" Content="{DynamicResource Text.Cancel}" Click="CloseWindow"/>
+      <Button Grid.Column="2" Classes="flat" Margin="8,0,0,0" MinWidth="80" Content="{DynamicResource Text.Cancel}" Click="CloseWindow"/>
     </Grid>
   </Grid>
 </v:ChromelessWindow>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 5e8d45d3..0e932aef 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -616,7 +616,7 @@
 
       <!-- Right -->
       <Grid Grid.Column="2" RowDefinitions="Auto,Auto,*"> 
-        <Grid Grid.Row="0" Height="26" ColumnDefinitions="*,Auto,Auto,Auto" Background="{DynamicResource Brush.Conflict}" IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
+        <Grid Grid.Row="0" Height="28" ColumnDefinitions="*,Auto,Auto,Auto" Background="{DynamicResource Brush.Conflict}" IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
           <ContentControl Grid.Column="0" Margin="8,0" Content="{Binding InProgressContext}">
             <ContentControl.DataTemplates>
               <DataTemplate DataType="vm:CherryPickInProgress">
@@ -637,14 +637,32 @@
             </ContentControl.DataTemplates>
           </ContentControl>
 
-          <Button Grid.Column="1" Classes="flat" FontWeight="Regular" Content="{DynamicResource Text.Repository.Resolve}" Height="20" Padding="8,0" Margin="4,0" Command="{Binding GotoResolve}">
+          <Button Grid.Column="1" 
+                  Classes="flat" 
+                  FontWeight="Regular"
+                  BorderThickness="0"
+                  Content="{DynamicResource Text.Repository.Resolve}" 
+                  Padding="8,0" Margin="4,0" 
+                  Command="{Binding GotoResolve}">
             <Button.IsVisible>
               <Binding Path="SelectedViewIndex" Converter="{x:Static c:IntConverters.IsNotOne}"/>
             </Button.IsVisible>
           </Button>
-
-          <Button Grid.Column="2" Classes="flat primary" FontWeight="Regular" Content="{DynamicResource Text.Repository.Continue}" Height="20" Padding="8,0" Margin="4,0" Command="{Binding ContinueMerge}" IsVisible="{Binding !HasUnsolvedConflicts}"/>
-          <Button Grid.Column="3" Classes="flat" FontWeight="Regular" Content="{DynamicResource Text.Repository.Abort}" Height="20" Padding="8,0" Margin="4,0" Command="{Binding AbortMerge}"/>
+          <Button Grid.Column="2" 
+                  Classes="flat primary" 
+                  FontWeight="Regular"
+                  BorderThickness="0"
+                  Content="{DynamicResource Text.Repository.Continue}" 
+                  Padding="8,0" Margin="4,0" 
+                  Command="{Binding ContinueMerge}" 
+                  IsVisible="{Binding !HasUnsolvedConflicts}"/>
+          <Button Grid.Column="3" 
+                  Classes="flat" 
+                  FontWeight="Regular"
+                  BorderThickness="0"
+                  Content="{DynamicResource Text.Repository.Abort}" 
+                  Padding="8,0" Margin="4,0" 
+                  Command="{Binding AbortMerge}"/>
         </Grid>
 
         <Border Grid.Row="1" Background="{DynamicResource Brush.Window}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">