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

This commit is contained in:
mika kuns
2026-05-30 17:38:09 +02:00
parent 9082f2ed71
commit 08f3babca4

View File

@@ -72,22 +72,15 @@
<DataTemplate x:DataType="vm:DiffFileViewModel"> <DataTemplate x:DataType="vm:DiffFileViewModel">
<Border Padding="10,8" Background="Transparent"> <Border Padding="10,8" Background="Transparent">
<StackPanel Spacing="4"> <StackPanel Spacing="4">
<TextBlock Text="{Binding Path}" <TextBlock Classes="path-mono" Text="{Binding Path}"
FontFamily="{DynamicResource MonoFont}"
FontSize="{StaticResource FontSizeMono}"
Foreground="{DynamicResource TextDimBrush}"
TextTrimming="PrefixCharacterEllipsis"/> TextTrimming="PrefixCharacterEllipsis"/>
<StackPanel Orientation="Horizontal" Spacing="6"> <StackPanel Orientation="Horizontal" Spacing="6">
<Border Classes="chip" Padding="5,2"> <Border Classes="chip" Padding="5,2">
<TextBlock Foreground="{DynamicResource MossBrightBrush}" <TextBlock Foreground="{DynamicResource MossBrightBrush}"
FontFamily="{DynamicResource MonoFont}"
FontSize="{StaticResource FontSizeEyebrow}"
Text="{Binding Additions, StringFormat='+{0}'}"/> Text="{Binding Additions, StringFormat='+{0}'}"/>
</Border> </Border>
<Border Classes="chip" Padding="5,2"> <Border Classes="chip" Padding="5,2">
<TextBlock Foreground="{DynamicResource BloodBrush}" <TextBlock Foreground="{DynamicResource BloodBrush}"
FontFamily="{DynamicResource MonoFont}"
FontSize="{StaticResource FontSizeEyebrow}"
Text="{Binding Deletions, StringFormat='{0}'}"/> Text="{Binding Deletions, StringFormat='{0}'}"/>
</Border> </Border>
</StackPanel> </StackPanel>
@@ -100,13 +93,10 @@
<!-- Diff content --> <!-- Diff content -->
<Grid Grid.Column="1" Background="{DynamicResource VoidBrush}"> <Grid Grid.Column="1" Background="{DynamicResource VoidBrush}">
<TextBlock Text="{Binding StatusMessage}" <TextBlock Classes="body" Text="{Binding StatusMessage}"
IsVisible="{Binding StatusMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" IsVisible="{Binding StatusMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"/>
Foreground="{DynamicResource TextDimBrush}"
FontFamily="{DynamicResource MonoFont}"
FontSize="{StaticResource FontSizeBody}"/>
<ScrollViewer HorizontalScrollBarVisibility="Auto" <ScrollViewer HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="Auto">
<ItemsControl ItemsSource="{Binding SelectedFile.Lines}"> <ItemsControl ItemsSource="{Binding SelectedFile.Lines}">