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

refactor(ui): normalize buttons/footer/padding in ConflictResolutionView

Browse Source
This commit is contained in:
mika kuns
2026-05-30 18:54:17 +02:00
parent cd64f287c3
commit 4a786eb732
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,16 +18,15 @@
<ctl:ModalShell Title="MERGE CONFLICT" CloseCommand="{Binding AbortCommand}"> <ctl:ModalShell Title="MERGE CONFLICT" CloseCommand="{Binding AbortCommand}">
<ctl:ModalShell.Footer> <ctl:ModalShell.Footer>
<StackPanel Orientation="Horizontal" Spacing="8" <StackPanel Orientation="Horizontal" Spacing="8"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center">
Margin="16,0"> <Button Classes="btn" Content="Open all in VS Code" Command="{Binding OpenInVsCodeCommand}"/>
<Button Content="Open all in VS Code" Command="{Binding OpenInVsCodeCommand}"/> <Button Classes="btn" Content="I've resolved — continue" Command="{Binding ContinueCommand}"/>
<Button Content="I've resolved — continue" Command="{Binding ContinueCommand}"/> <Button Classes="btn" Content="Abort this merge" Command="{Binding AbortCommand}"/>
<Button Content="Abort this merge" Command="{Binding AbortCommand}"/>
</StackPanel> </StackPanel>
</ctl:ModalShell.Footer> </ctl:ModalShell.Footer>
<!-- Content --> <!-- Content -->
<StackPanel Spacing="12" Margin="16" MinWidth="520"> <StackPanel Spacing="12" Margin="20,16" MinWidth="520">
<TextBlock Classes="heading" <TextBlock Classes="heading"
Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/> Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/>
<TextBlock Classes="body" Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}"/> <TextBlock Classes="body" Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}"/>