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

---
 .../Views/Planning/ConflictResolutionView.axaml       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml b/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
index f75d7ae..cc68ea9 100644
--- a/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
+++ b/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
@@ -18,16 +18,15 @@
   <ctl:ModalShell Title="MERGE CONFLICT" CloseCommand="{Binding AbortCommand}">
     <ctl:ModalShell.Footer>
       <StackPanel Orientation="Horizontal" Spacing="8"
-                  HorizontalAlignment="Right" VerticalAlignment="Center"
-                  Margin="16,0">
-        <Button Content="Open all in VS Code" Command="{Binding OpenInVsCodeCommand}"/>
-        <Button Content="I've resolved — continue" Command="{Binding ContinueCommand}"/>
-        <Button Content="Abort this merge" Command="{Binding AbortCommand}"/>
+                  HorizontalAlignment="Right" VerticalAlignment="Center">
+        <Button Classes="btn" Content="Open all in VS Code" Command="{Binding OpenInVsCodeCommand}"/>
+        <Button Classes="btn" Content="I've resolved — continue" Command="{Binding ContinueCommand}"/>
+        <Button Classes="btn" Content="Abort this merge" Command="{Binding AbortCommand}"/>
       </StackPanel>
     </ctl:ModalShell.Footer>
 
     <!-- Content -->
-    <StackPanel Spacing="12" Margin="16" MinWidth="520">
+    <StackPanel Spacing="12" Margin="20,16" MinWidth="520">
       <TextBlock Classes="heading"
                  Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/>
       <TextBlock Classes="body" Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}"/>