releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 12 Wiki Activity

refactor(ui): use danger-box in MergeModal

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-05-30 17:53:07 +02:00
parent dff5651db7
commit 539ebecf3a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
View File

@@ -60,10 +60,7 @@
TextWrapping="Wrap" TextWrapping="Wrap"
IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" /> IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
<Border BorderBrush="{DynamicResource BloodBrush}" <Border Classes="danger-box"
BorderThickness="1"
CornerRadius="6"
Padding="12,10"
IsVisible="{Binding HasConflict}"> IsVisible="{Binding HasConflict}">
<StackPanel Spacing="4"> <StackPanel Spacing="4">
<TextBlock Classes="title" Text="Conflicted files:" /> <TextBlock Classes="title" Text="Conflicted files:" />