michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

style(Conflict): better color for conflicts detected tool bar

Browse source
This commit is contained in:
leo 2020-08-06 11:08:58 +08:00
parent ba2063f956
commit 08dc039768
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SourceGit/Resources/Themes/Dark.xaml
View file

@ -7,6 +7,7 @@
<SolidColorBrush x:Key="Brush.BG4" Color="#FF303030"/> <SolidColorBrush x:Key="Brush.BG4" Color="#FF303030"/>
<SolidColorBrush x:Key="Brush.BG5" Color="#FF505050"/> <SolidColorBrush x:Key="Brush.BG5" Color="#FF505050"/>
<SolidColorBrush x:Key="Brush.BG6" Color="#FF404040"/> <SolidColorBrush x:Key="Brush.BG6" Color="#FF404040"/>
<SolidColorBrush x:Key="Brush.BG7" Color="#FFFAFAD2"/>
<SolidColorBrush x:Key="Brush.Border1" Color="#FF7C7C7C"/> <SolidColorBrush x:Key="Brush.Border1" Color="#FF7C7C7C"/>
<SolidColorBrush x:Key="Brush.Border2" Color="#FF404040"/> <SolidColorBrush x:Key="Brush.Border2" Color="#FF404040"/>
<SolidColorBrush x:Key="Brush.FG" Color="#FFF1F1F1"/> <SolidColorBrush x:Key="Brush.FG" Color="#FFF1F1F1"/>

1
SourceGit/Resources/Themes/Light.xaml
View file

@ -6,6 +6,7 @@
<SolidColorBrush x:Key="Brush.BG4" Color="#FFE6E7E8"/> <SolidColorBrush x:Key="Brush.BG4" Color="#FFE6E7E8"/>
<SolidColorBrush x:Key="Brush.BG5" Color="#FFBDBDBD"/> <SolidColorBrush x:Key="Brush.BG5" Color="#FFBDBDBD"/>
<SolidColorBrush x:Key="Brush.BG6" Color="#FFCFCFCF"/> <SolidColorBrush x:Key="Brush.BG6" Color="#FFCFCFCF"/>
<SolidColorBrush x:Key="Brush.BG7" Color="#FF836C2E"/>
<SolidColorBrush x:Key="Brush.Border1" Color="#FF898989"/> <SolidColorBrush x:Key="Brush.Border1" Color="#FF898989"/>
<SolidColorBrush x:Key="Brush.Border2" Color="#FFCFCFCF"/> <SolidColorBrush x:Key="Brush.Border2" Color="#FFCFCFCF"/>
<SolidColorBrush x:Key="Brush.FG" Color="#FF1F1F1F"/> <SolidColorBrush x:Key="Brush.FG" Color="#FF1F1F1F"/>

2
SourceGit/UI/Dashboard.xaml
View file

@ -493,7 +493,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- Abort panel --> <!-- Abort panel -->
<Grid x:Name="abortPanel" Grid.Row="0" Background="LightGoldenrodYellow" Visibility="Collapsed"> <Grid x:Name="abortPanel" Grid.Row="0" Background="{StaticResource Brush.BG7}" Visibility="Collapsed">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>