Skip to content

Commit b7a565d

Browse files
author
liccode
committed
ux: improve checkbox contrast in dark theme
1 parent f88fc0a commit b7a565d

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

‎src/Resources/Styles.axaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@
10211021
<Setter Property="Template">
10221022
<ControlTemplate>
10231023
<Grid Background="Transparent" ColumnDefinitions="Auto,*">
1024-
<Border x:Name="Border" Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" BorderBrush="{DynamicResource Brush.Border1}" BorderThickness="1" Background="Transparent" CornerRadius="2">
1024+
<Border x:Name="Border" Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" BorderBrush="{DynamicResource Brush.CheckBox.Border}" BorderThickness="1" Background="Transparent" CornerRadius="2">
10251025
<Path x:Name="Icon" Height="12" Width="12" Data="{DynamicResource Icons.Check}" Fill="{DynamicResource Brush.Accent}" IsVisible="False" Margin="0,2,0,0"/>
10261026
</Border>
10271027

@@ -1038,19 +1038,24 @@
10381038
<Style Selector="^:pointerover /template/ Border#Border">
10391039
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
10401040
</Style>
1041+
<Style Selector="^:checked /template/ Border#Border">
1042+
<Setter Property="Background" Value="{DynamicResource Brush.CheckBox.CheckedBackground}"/>
1043+
<Setter Property="BorderBrush" Value="{DynamicResource Brush.CheckBox.CheckedBorder}"/>
1044+
</Style>
10411045
<Style Selector="^:checked /template/ Path#Icon">
10421046
<Setter Property="IsVisible" Value="True"/>
1047+
<Setter Property="Fill" Value="{DynamicResource Brush.CheckBox.CheckedFG}"/>
10431048
</Style>
10441049
<Style Selector="^:focus-visible /template/ Border#Border">
10451050
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
10461051
<Setter Property="BorderThickness" Value="2"/>
10471052
</Style>
10481053
<Style Selector="^:focus-visible:checked /template/ Border#Border">
10491054
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
1050-
<Setter Property="Background" Value="{DynamicResource Brush.Accent}"/>
1055+
<Setter Property="Background" Value="{DynamicResource Brush.CheckBox.CheckedBackground}"/>
10511056
</Style>
10521057
<Style Selector="^:focus-visible:checked /template/ Path#Icon">
1053-
<Setter Property="Fill" Value="White"/>
1058+
<Setter Property="Fill" Value="{DynamicResource Brush.CheckBox.CheckedFG}"/>
10541059
</Style>
10551060
</Style>
10561061

‎src/Resources/Themes.axaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<Color x:Key="Color.InlineCode">#FFE4E4E4</Color>
3434
<Color x:Key="Color.InlineCodeFG">Black</Color>
3535
<Color x:Key="Color.HistoryBG">#FFF0F5F9</Color>
36+
<Color x:Key="Color.CheckBox.Border">#FF898989</Color>
37+
<SolidColorBrush x:Key="Brush.CheckBox.CheckedBackground" Color="Transparent"/>
38+
<SolidColorBrush x:Key="Brush.CheckBox.CheckedBorder" Color="#FF898989"/>
39+
<SolidColorBrush x:Key="Brush.CheckBox.CheckedFG" Color="{DynamicResource SystemAccentColor}"/>
3640
</ResourceDictionary>
3741

3842
<ResourceDictionary x:Key="Dark">
@@ -67,6 +71,10 @@
6771
<Color x:Key="Color.InlineCode">#FF383838</Color>
6872
<Color x:Key="Color.InlineCodeFG">#FFF0F0F0</Color>
6973
<Color x:Key="Color.HistoryBG">#FF272727</Color>
74+
<Color x:Key="Color.CheckBox.Border">#FFA8A8A8</Color>
75+
<SolidColorBrush x:Key="Brush.CheckBox.CheckedBackground" Color="{DynamicResource SystemAccentColor}"/>
76+
<SolidColorBrush x:Key="Brush.CheckBox.CheckedBorder" Color="{DynamicResource SystemAccentColor}"/>
77+
<SolidColorBrush x:Key="Brush.CheckBox.CheckedFG" Color="White"/>
7078
</ResourceDictionary>
7179
</ResourceDictionary.ThemeDictionaries>
7280

@@ -85,6 +93,7 @@
8593
<SolidColorBrush x:Key="Brush.Conflict.TheirsBG" Color="{DynamicResource Color.Conflict.TheirsBG}"/>
8694
<SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>
8795
<SolidColorBrush x:Key="Brush.Border1" Color="{DynamicResource Color.Border1}"/>
96+
<SolidColorBrush x:Key="Brush.CheckBox.Border" Color="{DynamicResource Color.CheckBox.Border}"/>
8897
<SolidColorBrush x:Key="Brush.Border2" Color="{DynamicResource Color.Border2}"/>
8998
<SolidColorBrush x:Key="Brush.FlatButton.Background" Color="{DynamicResource Color.FlatButton.Background}"/>
9099
<SolidColorBrush x:Key="Brush.FlatButton.BackgroundHovered" Color="{DynamicResource Color.FlatButton.BackgroundHovered}"/>

0 commit comments

Comments
 (0)