TextBox -> BrandedUI

Author: donokuda

src/GitHub.VisualStudio/Styles/ThemeDesignTime.xaml

@@ -15,8 +15,8 @@
   <SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="#FF3399FF" />
   <SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FF333337" />
   <SolidColorBrush x:Key="GitHubVsWindowText" Color="#FFF1F1F1" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBorder" Color="#FF3F3F46" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBackground" Color="#FF2D2D30" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF3F3F46" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FF2D2D30" />
 
   -->
 
@@ -29,8 +29,8 @@
   <SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="#FF3399FF" />
   <SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FFFCFCFC" />
   <SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF1E1E1E" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBorder" Color="#FFCCCEBD" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBackground" Color="#FFEEEEF2" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FFCCCEBD" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFEEEEF2" />
 
   <!-- Design time colors taken from the VS blue theme
   <SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF000000" />
@@ -40,7 +40,7 @@
   <SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="#FFE5C365" />
   <SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FFFFFFFF" />
   <SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF000000" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBorder" Color="#FF8591A2" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBackground" Color="#FFFFFFFF" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF8591A2" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFFFFFFF" />
   -->
 </ResourceDictionary>

src/GitHub.VisualStudio/Styles/VsBrush.xaml

@@ -10,6 +10,6 @@
   <SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="{DynamicResource VsColor.CommandBarSelectedBorder}" />
   <SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="{DynamicResource VsColor.SearchBoxBackground}" />
   <SolidColorBrush x:Key="GitHubVsWindowText" Color="{DynamicResource VsColor.WindowText}" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBorder" Color="{DynamicResource VsColor.BrandedUIBorder}" />
-  <SolidColorBrush x:Key="GitHubVsTextBoxBackground" Color="{DynamicResource VsColor.BrandedUIBackground}" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="{DynamicResource VsColor.BrandedUIBorder}" />
+  <SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="{DynamicResource VsColor.BrandedUIBackground}" />
 </ResourceDictionary>

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

@@ -133,9 +133,9 @@
             -->
 
             <Style x:Key="GitHubVsPromptTextBox" TargetType="{x:Type ui:PromptTextBox}" BasedOn="{StaticResource GitHubTextBox}">
-                <Setter Property="Background" Value="{DynamicResource GitHubVsTextBoxBackground}"/>
+                <Setter Property="Background" Value="{DynamicResource GitHubVsBrandedUIBackground}"/>
                 <Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}"/>
-                <Setter Property="BorderBrush" Value="{DynamicResource GitHubVsTextBoxBorder}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}"/>
                 <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
                 <Setter Property="HorizontalContentAlignment" Value="Left"/>
                 <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -173,7 +173,7 @@
                                     <Setter Property="Opacity" Value="0.5" />
                                 </Trigger>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubVsTextBoxBorder}" />
+                                    <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
                                 </Trigger>
                                 <Trigger Property="IsKeyboardFocusWithin" Value="True">
                                     <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubAccentBrush}" />