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

Commit 903a1ef

Browse files
committed
Merge branch don/stub-ui into release/1.0.99
2 parents f3b2585 + def012e commit 903a1ef

File tree

4 files changed

+199
-88
lines changed

4 files changed

+199
-88
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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<Color x:Key="GitHubPaneTitleColor">#FFFFFFFF</Color>
2020
<SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
2121

22-
<!--
23-
<SolidColorBrush x:Key="TabItem.Selected.Background" Color="#000000"/>
24-
<SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
25-
-->
26-
2722
<SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
2823
<SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
2924

@@ -47,4 +42,6 @@
4742

4843
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FF1B1B1C" />
4944
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FF434346" />
45+
46+
<SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#FF3F3F46" />
5047
</ResourceDictionary>

src/GitHub.VisualStudio/Styles/ThemeLight.xaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<Color x:Key="GitHubPaneTitleColor">#FF1B293E</Color>
2020
<SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
2121

22-
<!--
23-
<SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
24-
<SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
25-
-->
26-
2722
<SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
2823
<SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
2924

@@ -34,6 +29,7 @@
3429
<SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FF666666" />
3530
<SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FFCACACA" />
3631
<SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
32+
3733
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
3834

3935
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF8BD26B" />
@@ -47,4 +43,6 @@
4743

4844
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FFF6F6F6" />
4945
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FFCCCEDC" />
46+
47+
<SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#FFCCCEBD" />
5048
</ResourceDictionary>

0 commit comments

Comments
 (0)