From 3228a08c7aa80da1b4aba113c7af84e822e9e979 Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Sat, 30 May 2026 18:50:57 +0200
Subject: [PATCH] refactor(ui): normalize buttons/footer/padding in MergeModal

---
 src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
index 02d20d1..6996fde 100644
--- a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
@@ -19,9 +19,8 @@
   <ctl:ModalShell Title="MERGE WORKTREE" CloseCommand="{Binding CancelCommand}">
     <ctl:ModalShell.Footer>
       <StackPanel Orientation="Horizontal" Spacing="8"
-                  HorizontalAlignment="Right" VerticalAlignment="Center"
-                  Margin="16,0">
-        <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
+                  HorizontalAlignment="Right" VerticalAlignment="Center">
+        <Button Classes="btn" Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
         <Button Content="Merge" Classes="primary"
                 Command="{Binding SubmitCommand}"
                 IsDefault="True" MinWidth="90"/>