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 MergeModalView

Browse Source
This commit is contained in:
mika kuns
2026-05-30 17:32:29 +02:00
parent 97fc715856
commit 8e595a1e43
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,9 +32,7 @@
<ScrollViewer Padding="20,16"> <ScrollViewer Padding="20,16">
<StackPanel Spacing="12"> <StackPanel Spacing="12">
<TextBlock Text="{Binding TaskTitle, StringFormat='Merging: {0}'}" <TextBlock Classes="title" Text="{Binding TaskTitle, StringFormat='Merging: {0}'}" />
FontWeight="SemiBold"
Foreground="{DynamicResource TextBrush}" />
<StackPanel Spacing="4"> <StackPanel Spacing="4">
<TextBlock Classes="field-label" Text="Target branch"/> <TextBlock Classes="field-label" Text="Target branch"/>
@@ -68,16 +66,11 @@
Padding="12,10" Padding="12,10"
IsVisible="{Binding HasConflict}"> IsVisible="{Binding HasConflict}">
<StackPanel Spacing="4"> <StackPanel Spacing="4">
<TextBlock Text="Conflicted files:" <TextBlock Classes="title" Text="Conflicted files:" />
FontWeight="SemiBold"
Foreground="{DynamicResource TextBrush}" />
<ItemsControl ItemsSource="{Binding ConflictFiles}"> <ItemsControl ItemsSource="{Binding ConflictFiles}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding}" <TextBlock Classes="meta" Text="{Binding}" />
FontFamily="{DynamicResource MonoFont}"
FontSize="{StaticResource FontSizeMono}"
Foreground="{DynamicResource TextDimBrush}" />
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>