From 51d3ea2e1c554e8bb70e91cf708b7c5e9068c7d7 Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Sat, 30 May 2026 17:39:18 +0200
Subject: [PATCH] refactor(ui): unify text and close button in
 ConflictResolutionView

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

diff --git a/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml b/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
index f207273..f75d7ae 100644
--- a/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
+++ b/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
@@ -28,20 +28,20 @@
 
     <!-- Content -->
     <StackPanel Spacing="12" Margin="16" MinWidth="520">
-      <TextBlock FontWeight="SemiBold" FontSize="{StaticResource FontSizeH3}"
+      <TextBlock Classes="heading"
                  Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/>
-      <TextBlock Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}" Opacity="0.7"/>
+      <TextBlock Classes="body" Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}"/>
       <ItemsControl ItemsSource="{Binding ConflictedFiles}">
         <ItemsControl.ItemTemplate>
           <DataTemplate>
-            <TextBlock Text="{Binding}" FontFamily="{DynamicResource MonoFont}"/>
+            <TextBlock Classes="path-mono" Text="{Binding}"/>
           </DataTemplate>
         </ItemsControl.ItemTemplate>
       </ItemsControl>
-      <TextBlock Text="{Binding VsCodeError}" Foreground="{DynamicResource BloodBrush}"
+      <TextBlock Classes="meta" Text="{Binding VsCodeError}" Foreground="{DynamicResource BloodBrush}"
                  IsVisible="{Binding VsCodeError, Converter={x:Static ObjectConverters.IsNotNull}}"
                  TextWrapping="Wrap"/>
-      <TextBlock Text="{Binding ActionError}" Foreground="{DynamicResource BloodBrush}"
+      <TextBlock Classes="meta" Text="{Binding ActionError}" Foreground="{DynamicResource BloodBrush}"
                  IsVisible="{Binding ActionError, Converter={x:Static ObjectConverters.IsNotNull}}"
                  TextWrapping="Wrap"/>
     </StackPanel>