refactor(ui): use danger-box in MergeModal

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-30 17:53:07 +02:00
parent dff5651db7
commit 539ebecf3a
1 changed files with 1 additions and 4 deletions
--- 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:" />