From 539ebecf3a759f12d3661eb2a9b9fa7e0955c527 Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Sat, 30 May 2026 17:53:07 +0200
Subject: [PATCH] refactor(ui): use danger-box in MergeModal

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
index bf6f27a..02d20d1 100644
--- a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
@@ -60,10 +60,7 @@
                    TextWrapping="Wrap"
                    IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
 
-        <Border BorderBrush="{DynamicResource BloodBrush}"
-                BorderThickness="1"
-                CornerRadius="6"
-                Padding="12,10"
+        <Border Classes="danger-box"
                 IsVisible="{Binding HasConflict}">
           <StackPanel Spacing="4">
             <TextBlock Classes="title" Text="Conflicted files:" />