mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-20 19:55:00 +00:00
ux: new style for revision/branch compare targets
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
bbc840a5cb
commit
ddf643c081
2 changed files with 5 additions and 5 deletions
|
@ -46,7 +46,7 @@
|
||||||
<!-- Compare Targets -->
|
<!-- Compare Targets -->
|
||||||
<Border Grid.Row="1">
|
<Border Grid.Row="1">
|
||||||
<Grid Margin="48,8,48,8" ColumnDefinitions="*,48,*">
|
<Grid Margin="48,8,48,8" ColumnDefinitions="*,48,*">
|
||||||
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Diff.DeletedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
||||||
<Grid RowDefinitions="Auto,*">
|
<Grid RowDefinitions="Auto,*">
|
||||||
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
|
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
|
||||||
<v:Avatar Width="16" Height="16"
|
<v:Avatar Width="16" Height="16"
|
||||||
|
@ -67,10 +67,10 @@
|
||||||
|
|
||||||
<!-- Swap Button -->
|
<!-- Swap Button -->
|
||||||
<Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
|
<Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
|
||||||
<Path Width="16" Height="16" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Compare}"/>
|
<Path Width="16" Height="16" Data="{DynamicResource Icons.Compare}"/>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Diff.AddedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
||||||
<Grid RowDefinitions="Auto,*">
|
<Grid RowDefinitions="Auto,*">
|
||||||
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
|
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
|
||||||
<v:Avatar Width="16" Height="16"
|
<v:Avatar Width="16" Height="16"
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
<!-- Compare Revision Info -->
|
<!-- Compare Revision Info -->
|
||||||
<Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">
|
<Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">
|
||||||
<!-- Base Revision -->
|
<!-- Base Revision -->
|
||||||
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Diff.DeletedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
||||||
<ContentControl Content="{Binding StartPoint}"/>
|
<ContentControl Content="{Binding StartPoint}"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<!-- Right Revision -->
|
<!-- Right Revision -->
|
||||||
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Diff.AddedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
||||||
<ContentControl Content="{Binding EndPoint}"/>
|
<ContentControl Content="{Binding EndPoint}"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue