Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit a2df8e7

Browse files
committed
Use custom themes for tab border
The border for the blue theme is too dark in my opinion.
1 parent f87e9c9 commit a2df8e7

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

src/GitHub.VisualStudio/Styles/ThemeBlue.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@
4242

4343
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FFF6F6F6" />
4444
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FFCCCEDC" />
45+
46+
<SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#FFD0D7E4" />
4547
</ResourceDictionary>

src/GitHub.VisualStudio/Styles/ThemeDark.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@
4242

4343
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FF1B1B1C" />
4444
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FF434346" />
45+
46+
<SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#FF3F3F46" />
4547
</ResourceDictionary>

src/GitHub.VisualStudio/Styles/ThemeDesignTime.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
55

66
<ResourceDictionary.MergedDictionaries>
7-
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDark.xaml" />
7+
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeBlue.xaml" />
88
</ResourceDictionary.MergedDictionaries>
99

1010
<!-- Design time colors taken from the VS dark theme
11-
-->
1211
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FFFFFFFF" />
1312
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FF252526" />
1413
<SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF999999" />
@@ -17,6 +16,7 @@
1716
<SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FF333337" />
1817
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FFF1F1F1" />
1918
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF3F3F46" />
19+
-->
2020

2121
<!-- Design time colors taken from the VS light theme
2222
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF1E1E1E" />
@@ -31,6 +31,7 @@
3131
-->
3232

3333
<!-- Design time colors taken from the VS blue theme
34+
-->
3435
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF000000" />
3536
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FFFFFFFF" />
3637
<SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF6d6d6d" />
@@ -40,5 +41,4 @@
4041
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF000000" />
4142
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF8591A2" />
4243
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFFFFFFF" />
43-
-->
4444
</ResourceDictionary>

src/GitHub.VisualStudio/Styles/ThemeLight.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FF666666" />
3030
<SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FFCACACA" />
3131
<SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
32+
3233
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
3334

3435
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF8BD26B" />
@@ -42,4 +43,6 @@
4243

4344
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FFF6F6F6" />
4445
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FFCCCEDC" />
46+
47+
<SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#FFCCCEBD" />
4548
</ResourceDictionary>

src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Setter Property="HorizontalContentAlignment" Value="Center"/>
3636
<Setter Property="VerticalContentAlignment" Value="Center"/>
3737
<Setter Property="Background" Value="{DynamicResource GitHubVsToolWindowBackground}"/>
38-
<Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}"/>
38+
<Setter Property="BorderBrush" Value="{DynamicResource GitHubTabItemSelectedBorder}"/>
3939
<Setter Property="BorderThickness" Value="0,1,0,0"/>
4040
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
4141
<Setter Property="Template">
@@ -117,7 +117,7 @@
117117
<ControlTemplate.Triggers>
118118
<Trigger Property="IsSelected" Value="True">
119119
<Setter TargetName="Border" Property="Background" Value="{DynamicResource GitHubVsToolWindowBackground}" />
120-
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
120+
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GitHubTabItemSelectedBorder}" />
121121
<Setter TargetName="Border" Property="BorderThickness" Value="1,1,1,0" />
122122
</Trigger>
123123

@@ -690,7 +690,6 @@
690690
Foreground="{DynamicResource GitHubVsGrayText}"/>
691691
</Grid>
692692
</ListViewItem>
693-
694693
</ListView>
695694
</TabItem>
696695

0 commit comments

Comments
 (0)