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

refactor(ui): unify text and close button in ConflictResolutionView

Browse Source
This commit is contained in:
mika kuns
2026-05-30 17:39:18 +02:00
parent 335b422e23
commit 51d3ea2e1c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
View File

@@ -28,20 +28,20 @@
<!-- Content --> <!-- Content -->
<StackPanel Spacing="12" Margin="16" MinWidth="520"> <StackPanel Spacing="12" Margin="16" MinWidth="520">
<TextBlock FontWeight="SemiBold" FontSize="{StaticResource FontSizeH3}" <TextBlock Classes="heading"
Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/> 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 ItemsSource="{Binding ConflictedFiles}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding}" FontFamily="{DynamicResource MonoFont}"/> <TextBlock Classes="path-mono" Text="{Binding}"/>
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </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}}" IsVisible="{Binding VsCodeError, Converter={x:Static ObjectConverters.IsNotNull}}"
TextWrapping="Wrap"/> 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}}" IsVisible="{Binding ActionError, Converter={x:Static ObjectConverters.IsNotNull}}"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
</StackPanel> </StackPanel>