Skip to content

Commit ddf643c

Browse files
committed
ux: new style for revision/branch compare targets
Signed-off-by: leo <[email protected]>
1 parent bbc840a commit ddf643c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Views/BranchCompare.axaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<!-- Compare Targets -->
4747
<Border Grid.Row="1">
4848
<Grid Margin="48,8,48,8" ColumnDefinitions="*,48,*">
49-
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
49+
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Diff.DeletedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
5050
<Grid RowDefinitions="Auto,*">
5151
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
5252
<v:Avatar Width="16" Height="16"
@@ -67,10 +67,10 @@
6767

6868
<!-- Swap Button -->
6969
<Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
70-
<Path Width="16" Height="16" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Compare}"/>
70+
<Path Width="16" Height="16" Data="{DynamicResource Icons.Compare}"/>
7171
</Button>
7272

73-
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
73+
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Diff.AddedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
7474
<Grid RowDefinitions="Auto,*">
7575
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
7676
<v:Avatar Width="16" Height="16"

src/Views/RevisionCompare.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!-- Compare Revision Info -->
3838
<Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">
3939
<!-- Base Revision -->
40-
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
40+
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Diff.DeletedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
4141
<ContentControl Content="{Binding StartPoint}"/>
4242
</Border>
4343

@@ -47,7 +47,7 @@
4747
</Button>
4848

4949
<!-- Right Revision -->
50-
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
50+
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Diff.AddedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
5151
<ContentControl Content="{Binding EndPoint}"/>
5252
</Border>
5353

0 commit comments

Comments
 (0)