Remove use of legacy TextBlocks.xaml

Stop using RoundedPromptTextBox.

Author: jcansdale

src/GitHub.UI/Assets/TextBlocks.xaml

@@ -4,6 +4,5 @@
         <ResourceDictionary Source="pack://application:,,,/GitHub.UI;component/Assets/Styles.xaml" />
         <ResourceDictionary Source="pack://application:,,,/GitHub.UI;component/Assets/Controls.xaml" />
         <ResourceDictionary Source="pack://application:,,,/GitHub.UI;component/Assets/Buttons.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/GitHub.UI;component/Assets/TextBlocks.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

src/GitHub.UI/SharedDictionary.xaml

@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
+                    xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" 
                     xmlns:local="clr-namespace:GitHub.VisualStudio.Styles"
                     xmlns:vsui="clr-namespace:GitHub.VisualStudio.UI">
 
@@ -48,7 +49,7 @@
                             <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubAccentBrush}" />
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedBrushKey}}" />
                         </Trigger>
                         <DataTrigger Binding="{Binding Text.Length, RelativeSource={RelativeSource Self}}" Value="0">
                             <Setter Property="Opacity" TargetName="PromptLabel" Value="0.7" />

src/GitHub.VisualStudio.UI/Styles/TextBlocks.xaml

@@ -1,6 +1,7 @@
 <ResourceDictionary 
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" 
   xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
   xmlns:vsui="clr-namespace:GitHub.VisualStudio.UI">
 
@@ -21,6 +22,9 @@
   <SolidColorBrush x:Key="GitHubAnnotationMarkerWarningFill" Color="#ffc806" />
   <SolidColorBrush x:Key="GitHubAnnotationMarkerFailureFill" Color="#d53243" />
 
+    <!-- HACK: Use the same color as border of focused text box -->
+  <SolidColorBrush x:Key="GitHubAccentBrush" Color="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedColorKey}}" />
+
   <!-- Team Foundation Colors -->
   <SolidColorBrush x:Key="TFRequiredTextBoxBorderBrushKey" Color="{Binding Source={x:Static vsui:TeamFoundationColors.Instance}, Path=RequiredTextBoxBorderColor, Mode=OneWay}" />
   <SolidColorBrush x:Key="TFTextBoxBorderBrushKey" Color="{Binding Source={x:Static vsui:TeamFoundationColors.Instance}, Path=TextBoxBorderColor, Mode=OneWay}" />

src/GitHub.VisualStudio.UI/Styles/VsBrush.xaml

@@ -1,22 +1,16 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ghfvs="https://github.com/github/VisualStudio"
-                    xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"                    
-                    xmlns:local="clr-namespace:GitHub.VisualStudio.Styles">
+                    xmlns:ghfvs="https://github.com/github/VisualStudio">
 
     <ResourceDictionary.MergedDictionaries>
         <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
         <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
         <StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
-        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/TextBlocks.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style TargetType="{x:Type ghfvs:PromptTextBox}" BasedOn="{StaticResource GitHubVsPromptTextBox}" />
     <Style TargetType="{x:Type ghfvs:SecurePasswordBox}" BasedOn="{StaticResource GitHubVsPromptTextBox}" />
     <Style TargetType="{x:Type TextBlock}" x:Key="GitHubH1TextBlock" BasedOn="{StaticResource TextBlockEnvironment200PercentFontSizeStyleKey}" />
     <Style TargetType="{x:Type TextBlock}" x:Key="GitHubDescriptionTextBlock" BasedOn="{StaticResource TextBlockEnvironment111PercentFontSizeStyleKey}" />
     <Style TargetType="{x:Type ghfvs:FilteredComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}" />
     <Style TargetType="{x:Type ghfvs:GitHubComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}" />
-
-    <!--  HACK: Keep the focused text box border consistent -->
-    <SolidColorBrush x:Key="GitHubAccentBrush" Color="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedColorKey}}" />
 </ResourceDictionary>

src/GitHub.VisualStudio.UI/Views/Dialog/DialogStyles.xaml

@@ -142,12 +142,9 @@
                               Loaded="body_Loaded"
                               SpellCheck.IsEnabled="True">
                 <ui:PromptTextBox.Style>
-                    <Style TargetType="ui:PromptTextBox" BasedOn="{StaticResource RoundedPromptTextBox}">
-                        <Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
-                        <Setter Property="Background" Value="{DynamicResource VsBrush.SearchBoxBackground}" />
+                    <Style TargetType="ui:PromptTextBox" BasedOn="{StaticResource GitHubVsPromptTextBox}">
                         <Setter Property="Height" Value="28"/>
                         <Setter Property="PromptText" Value="Reply..."/>
-                        <Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
 
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding EditState}" Value="Editing">

src/GitHub.VisualStudio.UI/Views/Documents/IssueishCommentView.xaml

@@ -175,12 +175,9 @@
                               Loaded="body_Loaded"
                               SpellCheck.IsEnabled="True">
                 <ui:PromptTextBox.Style>
-                    <Style TargetType="ui:PromptTextBox" BasedOn="{StaticResource RoundedPromptTextBox}">
-                        <Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
-                        <Setter Property="Background" Value="{DynamicResource VsBrush.SearchBoxBackground}" />
+                    <Style TargetType="ui:PromptTextBox" BasedOn="{StaticResource GitHubVsPromptTextBox}">
                         <Setter Property="Height" Value="28"/>
                         <Setter Property="PromptText" Value="Reply..."/>
-                        <Setter Property="BorderBrush" Value="{DynamicResource GitHubVsBrandedUIBorder}" />
 
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding EditState}" Value="Editing">