Merge pull request #2261 from github/fixes/dialog-style-guide

Use Visual Studio colors and styles for all dialogs

Author: StanleyGoldman

src/GitHub.InlineReviews/Properties/DesignTimeResources.xaml

@@ -1,11 +1,21 @@
 <ResourceDictionary
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/VsColorsBlue.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/VsBrushesBlue.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/ThemeBlue.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/VsBrushes.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/VsColors.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/CommonControlsColors.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/ThemedDialogColors.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/EnvironmentColors.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/Dark/TreeViewColors.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsButtonStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsCheckboxStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsComboboxStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/CommonControlsTextboxStyle.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Themes/ThemedDialogStyles.xaml" />
 
+        <!-- Set this theme to match the Visual Studio theme above -->
+        <ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/ThemeDark.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary x:Key="ThemedDialogDefaultStylesKey" Source="/Themes/ThemedDialogDefaultStyles.xaml" />
 </ResourceDictionary>

src/GitHub.UI.Reactive/Assets/Controls.xaml

@@ -9,7 +9,6 @@
         <ResourceDictionary Source="Controls\Validation\UserErrorMessages.xaml" />
         <ResourceDictionary Source="Controls\Validation\ValidationMessage.xaml" />
         <ResourceDictionary Source="Controls\GitHubTabControl.xaml" />
-        <ResourceDictionary Source="Controls\FilteredComboBox.xaml" />
         <ResourceDictionary Source="Controls\GitHubComboBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

src/GitHub.UI.Reactive/Assets/Controls/FilteredComboBox.xaml

@@ -11,14 +11,21 @@
     d:DesignWidth="262"
     AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticatonInputCustom}">
     <UserControl.Resources>
-        <Style TargetType="{x:Type TextBox}">
-            <Setter Property="Width" Value="36"/>
-            <Setter Property="Height" Value="46"/>
-            <Setter Property="Margin" Value="0,0,8,0"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="FontSize" Value="20px" />
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
+                <ResourceDictionary>
+                    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+                        <Setter Property="Width" Value="36"/>
+                        <Setter Property="Height" Value="46"/>
+                        <Setter Property="Margin" Value="0,0,8,0"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="FontSize" Value="20px" />
+                    </Style>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal" UseLayoutRounding="True" SnapsToDevicePixels="True" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticationInputStackPanel}">
         <TextBox x:Name="one" />