Skip to content

Commit ebdad30

Browse files
committed
ux: submodule diff layout
Signed-off-by: leo <longshuang@msn.cn>
1 parent 2a3490b commit ebdad30

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/Views/DiffView.axaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,14 @@
265265
<TextBlock Text="{DynamicResource Text.Diff.Submodule.Deleted}" Margin="8,0" FontSize="10" Foreground="White"/>
266266
</Border>
267267

268-
<Border Margin="0,8,0,0" IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}">
268+
<Border Margin="0,8"
269+
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
270+
Background="{DynamicResource Brush.Window}"
271+
IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}">
269272
<ContentControl Content="{Binding Old}">
270273
<ContentControl.DataTemplates>
271274
<DataTemplate DataType="m:RevisionSubmodule">
272-
<Border Margin="0,0,0,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Background="{DynamicResource Brush.Window}">
273-
<v:CommitBaseInfo Margin="0,4,8,6" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
274-
</Border>
275+
<v:CommitBaseInfo Margin="0,4,8,6" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
275276
</DataTemplate>
276277
</ContentControl.DataTemplates>
277278
</ContentControl>
@@ -290,7 +291,10 @@
290291
<TextBlock Text="{DynamicResource Text.Diff.Submodule.New}" Margin="8,0" FontSize="10" Foreground="White"/>
291292
</Border>
292293

293-
<Border Margin="0,8,0,0" BorderThickness="1" BorderBrush="Green" Background="{DynamicResource Brush.Window}" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
294+
<Border Margin="0,8"
295+
BorderThickness="1" BorderBrush="Green"
296+
Background="{DynamicResource Brush.Window}"
297+
IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
294298
<ContentControl Content="{Binding New}">
295299
<ContentControl.DataTemplates>
296300
<DataTemplate DataType="m:RevisionSubmodule">

0 commit comments

Comments
 (0)