Theme tab control border

Remove unused color brushes

Author: donokuda

src/GitHub.VisualStudio/Styles/ThemeBlue.xaml

@@ -19,9 +19,6 @@
   <Color x:Key="GitHubPaneTitleColor">#FF1B293E</Color>
   <SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
 
-  <SolidColorBrush x:Key="GitHubTabItemSelectedBackground" Color="#FFFFFF"/>
-  <SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#ACACAC"/>
-
   <SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
   <SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
 

src/GitHub.VisualStudio/Styles/ThemeDark.xaml

@@ -19,9 +19,6 @@
   <Color x:Key="GitHubPaneTitleColor">#FFFFFFFF</Color>
   <SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
 
-  <SolidColorBrush x:Key="GitHubTabItemSelectedBackground" Color="#000000"/>
-  <SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#ACACAC"/>
-
   <SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
   <SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
 

src/GitHub.VisualStudio/Styles/ThemeDesignTime.xaml

@@ -4,10 +4,11 @@
   xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
   <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeBlue.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDark.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <!-- Design time colors taken from the VS dark theme
+  -->
   <SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FFFFFFFF" />
   <SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FF252526" />
   <SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF999999" />
@@ -16,7 +17,6 @@
   <SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FF333337" />
   <SolidColorBrush x:Key="GitHubVsWindowText" Color="#FFF1F1F1" />
   <SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF3F3F46" />
-  -->
 
   <!-- Design time colors taken from the VS light theme
   <SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF1E1E1E" />
@@ -31,7 +31,6 @@
   -->
 
   <!-- Design time colors taken from the VS blue theme
-  -->
   <SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF000000" />
   <SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FFFFFFFF" />
   <SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF6d6d6d" />
@@ -41,4 +40,5 @@
   <SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF000000" />
   <SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF8591A2" />
   <SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFFFFFFF" />
+  -->
 </ResourceDictionary>

src/GitHub.VisualStudio/Styles/ThemeLight.xaml

@@ -19,9 +19,6 @@
   <Color x:Key="GitHubPaneTitleColor">#FF1B293E</Color>
   <SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
 
-  <SolidColorBrush x:Key="GitHubTabItemSelectedBackground" Color="#FFFFFF"/>
-  <SolidColorBrush x:Key="GitHubTabItemSelectedBorder" Color="#ACACAC"/>
-
   <SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
   <SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
 

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

@@ -35,7 +35,7 @@
                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
                 <Setter Property="Background" Value="{DynamicResource GitHubVsToolWindowBackground}"/>
-                <Setter Property="BorderBrush" Value="#FFD0D7E4"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}"/>
                 <Setter Property="BorderThickness" Value="0,1,0,0"/>
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
                 <Setter Property="Template">
@@ -109,15 +109,15 @@
                                         x:Name="ContentSite"
                                         FontSize="12"
                                         VerticalAlignment="Center"
-                                        Foreground="#ff333333"
+                                        Foreground="{DynamicResource GitHubVsToolWindowText}"
                                         Text="{TemplateBinding Header}" />
                                 </DockPanel>
                             </Border>
 
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsSelected" Value="True">
                                     <Setter TargetName="Border" Property="Background" Value="{DynamicResource GitHubVsToolWindowBackground}" />
-                                    <Setter TargetName="Border" Property="BorderBrush" Value="#ffD0D7E4" />
+                                    <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
                                     <Setter TargetName="Border" Property="BorderThickness" Value="1,1,1,0" />
                                 </Trigger>