From 8e595a1e438b9053ac508020512046148e7dcea8 Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Sat, 30 May 2026 17:32:29 +0200
Subject: [PATCH] refactor(ui): unify text and close button in MergeModalView

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

diff --git a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
index fdcb9ac..bf6f27a 100644
--- a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
@@ -32,9 +32,7 @@
     <ScrollViewer Padding="20,16">
       <StackPanel Spacing="12">
 
-        <TextBlock Text="{Binding TaskTitle, StringFormat='Merging: {0}'}"
-                   FontWeight="SemiBold"
-                   Foreground="{DynamicResource TextBrush}" />
+        <TextBlock Classes="title" Text="{Binding TaskTitle, StringFormat='Merging: {0}'}" />
 
         <StackPanel Spacing="4">
           <TextBlock Classes="field-label" Text="Target branch"/>
@@ -68,16 +66,11 @@
                 Padding="12,10"
                 IsVisible="{Binding HasConflict}">
           <StackPanel Spacing="4">
-            <TextBlock Text="Conflicted files:"
-                       FontWeight="SemiBold"
-                       Foreground="{DynamicResource TextBrush}" />
+            <TextBlock Classes="title" Text="Conflicted files:" />
             <ItemsControl ItemsSource="{Binding ConflictFiles}">
               <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                  <TextBlock Text="{Binding}"
-                             FontFamily="{DynamicResource MonoFont}"
-                             FontSize="{StaticResource FontSizeMono}"
-                             Foreground="{DynamicResource TextDimBrush}" />
+                  <TextBlock Classes="meta" Text="{Binding}" />
                 </DataTemplate>
               </ItemsControl.ItemTemplate>
             </ItemsControl>