github · StanleyGoldman · Apr 4, 2019 · Mar 5, 2019 · Mar 5, 2019 · Mar 5, 2019
diff --git a/src/GitHub.UI/Assets/Buttons.xaml b/src/GitHub.UI/Assets/Buttons.xaml
@@ -8,10 +8,8 @@
     -->
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Controls/Buttons/OcticonCircleButton.xaml" />
         <ResourceDictionary Source="../Controls/Buttons/OcticonLinkButton.xaml" />
         <ResourceDictionary Source="../Controls/Buttons/OcticonButton.xaml" />
-        <ResourceDictionary Source="../Controls/ToggleButtons/OcticonCircleToggleButton.xaml" />
         <ResourceDictionary Source="../Controls/ToggleButtons/OcticonLinkToggleButton.xaml" />
     </ResourceDictionary.MergedDictionaries>
 

diff --git a/src/GitHub.UI/Assets/TextBlocks.xaml b/src/GitHub.UI/Assets/TextBlocks.xaml
@@ -153,13 +153,6 @@
     <Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource GitHubPasswordBox}" />
     <!-- End PasswordBox -->
 
-    <!-- Label -->
-    <Style x:Key="GitHubLabel" TargetType="{x:Type Label}">
-        <Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />
-    </Style>
-    <Style TargetType="{x:Type Label}" BasedOn="{StaticResource GitHubLabel}" />
-    <!-- End Label -->
-
     <!-- Textblock -->
     <Style x:Key="GitHubTextBlock" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />

diff --git a/src/GitHub.UI/Controls/Buttons/OcticonCircleButton.cs b/src/GitHub.UI/Controls/Buttons/OcticonCircleButton.cs
diff --git a/src/GitHub.UI/Controls/Buttons/OcticonCircleButton.xaml b/src/GitHub.UI/Controls/Buttons/OcticonCircleButton.xaml
diff --git a/src/GitHub.UI/Controls/ToggleButtons/OcticonCircleToggleButton.cs b/src/GitHub.UI/Controls/ToggleButtons/OcticonCircleToggleButton.cs
diff --git a/src/GitHub.UI/Controls/ToggleButtons/OcticonCircleToggleButton.xaml b/src/GitHub.UI/Controls/ToggleButtons/OcticonCircleToggleButton.xaml
diff --git a/src/GitHub.UI/Controls/ToggleButtons/OcticonToggleButton.cs b/src/GitHub.UI/Controls/ToggleButtons/OcticonToggleButton.cs
@@ -48,7 +48,7 @@ public abstract class OcticonToggleButton: ToggleButton
         );
 
         public static readonly DependencyProperty IconRotationAngleProperty =
-            OcticonCircleButton.IconRotationAngleProperty.AddOwner(typeof(OcticonToggleButton));
+            OcticonButton.IconRotationAngleProperty.AddOwner(typeof(OcticonToggleButton));
 
         public Octicon IconChecked
         {

diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
@@ -37,4 +37,13 @@
       <DependentUpon>NoRemoteOriginView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <Page Include="Properties\DesignTimeResources.xaml" Condition="'$(DesignTime)'=='true' OR ('$(SolutionPath)'!='' AND Exists('$(SolutionPath)') AND '$(BuildingInsideVisualStudio)'!='true' AND '$(BuildingInsideExpressionBlend)'!='true')">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <ContainsDesignTimeResources>true</ContainsDesignTimeResources>
+    </Page>
+  </ItemGroup>
+
 </Project>
diff --git a/src/GitHub.VisualStudio.UI/Properties/DesignTimeResources.xaml b/src/GitHub.VisualStudio.UI/Properties/DesignTimeResources.xaml
@@ -0,0 +1,11 @@
+<ResourceDictionary
+        xmlns="http://schemas.microsoft.com/winfx/20
F438
06/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>
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml
@@ -6,6 +6,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog.Clone"
              xmlns:uic="clr-namespace:GitHub.VisualStudio.UI.Controls"
+             xmlns:ui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
+             Background="{DynamicResource VsBrush.Window}"
              mc:Ignorable="d" d:DesignHeight="414" d:DesignWidth="440">
     <d:DesignData.DataContext>
         <ghfvs:RepositoryCloneViewModelDesigner/>
@@ -14,32 +16,34 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
                 <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
                 <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
                 <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
+            <Style TargetType="{x:Type TextBox}"
+                   BasedOn="{StaticResource {x:Static ui:VsResourceKeys.ThemedDialogTextBoxStyleKey}}" />
         </ResourceDictionary>
     </UserControl.Resources>
 
     <DockPanel>
         <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Center">
-            <ghfvs:OcticonCircleButton
-                                   Margin="12"
-                                   HorizontalAlignment="Center"
-                                   Icon="check"
-                                   IsDefault="True"
-                                   Command="{Binding Clone}"
-                                   Content="Clone"
-                                   AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.CloneRepositoryButton}"/>
+            <Button
+                Margin="12"
+                HorizontalAlignment="Center"
+                IsDefault="True"
+                Command="{Binding Clone}"
+                Content="Clone"
+                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.CloneRepositoryButton}"/>
 
-            <ghfvs:OcticonCircleButton
-                                   Margin="12"
-                                   HorizontalAlignment="Center"
-                                   Icon="check"
-                                   IsDefault="True"
-                                   Command="{Binding Open}"
-                                   Content="Open"
-                                   AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.OpenRepositoryButton}"/>
+            <Button
+                Margin="12"
+                HorizontalAlignment="Center"
+                IsDefault="True"
+                Command="{Binding Open}"
+                Content="Open"
+                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.OpenRepositoryButton}"/>
         </StackPanel>
 
         <DockPanel DockPanel.Dock="Bottom"

diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml
@@ -8,6 +8,7 @@
                                mc:Ignorable="d"
                                d:DesignWidth="414"
                                d:DesignHeight="440"
+                               xmlns:ui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
                                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.GistCreationControlCustom}">
     <Control.Resources>
         <ResourceDictionary>
@@ -20,15 +21,15 @@
     <DockPanel Style="{DynamicResource DialogContainerDockPanel}">
         <ghfvs:OcticonImage Icon="logo_github" Style="{DynamicResource GitHubLogo}" Margin="0,10,0,-10" Panel.ZIndex="100" DockPanel.Dock="Top" />
 
-        <ghfvs:OcticonCircleButton
+        <Button
+            Style="{DynamicResource {x:Static ui:VsResourceKeys.ThemedDialogButtonStyleKey}}"
             DockPanel.Dock="Bottom"
             IsDefault="True"
             Margin="0"
             x:Name="createGistButton"
             HorizontalAlignment="Center"
-            Icon="check">
-            <TextBlock Text="{x:Static ghfvs:Resources.CreateLink}"/>
-        </ghfvs:OcticonCircleButton>
+            Content="{x:Static ghfvs:Resources.CreateLink}">
+        </Button>
 
         <StackPanel>
             <ghfvs:HorizontalShadowDivider />

diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/GitHubDialogWindow.xaml
@@ -12,7 +12,7 @@
                    Height="460"
                    MinWidth="414"
                    MinHeight="460"
-                   Background="White"
+                   Background="{DynamicResource VsBrush.Window}"
                    FontFamily="Segoe UI"
                    FontSize="12"
                    FontStretch="Normal"
@@ -24,10 +24,15 @@
                    UseLayoutRounding="True"
                    WindowStartupLocation="CenterOwner"
                    Content="{Binding Content}">
-  <Window.Resources>
-    <local:ViewLocator x:Key="viewLocator"/>
-    <DataTemplate DataType="{x:Type ghfvs:ViewModelBase}">
-      <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
-    </DataTemplate>
-  </Window.Resources>
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
+            </ResourceDictionary.MergedDictionaries>
+            <local:ViewLocator x:Key="viewLocator"/>
+            <DataTemplate DataType="{x:Type ghfvs:ViewModelBase}">
+                <ContentControl Content="{Binding Converter={StaticResource viewLocator}}"/>
+            </DataTemplate>
+        </ResourceDictionary>
+    </Window.Resources>
 </pfui:DialogWindow>
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/LogOutRequiredView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
+             xmlns:ui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
              mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
 
   <Control.Resources>
@@ -30,13 +31,13 @@
            FontSize="16"
            Content="You need to sign out and back in." />
 
-    <ghfvs:OcticonCircleButton DockPanel.Dock="Bottom"
-                               Command="{Binding LogOut}"
-                               Content="Sign out"
-                               Icon="check"
-                               IsDefault="True"
-                               Margin="0 16"
-                               HorizontalAlignment="Center"/>
+    <Button Style="{DynamicResource {x:Static ui:VsResourceKeys.ThemedDialogButtonStyleKey}}"
+            DockPanel.Dock="Bottom"
+            Command="{Binding LogOut}"
+            Content="Sign out"
+            IsDefault="True"
+            Margin="0 16"
+            HorizontalAlignment="Center"/>
 
     <TextBlock TextWrapping="Wrap"
                 TextAlignment="Center"

diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml
@@ -9,6 +9,7 @@
     d:DesignWidth="414"
     d:DesignHeight="440"
     Style="{DynamicResource DialogUserControl}"
+    xmlns:ui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
     AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticationCustom}" >
 
     <Control.Resources>
@@ -66,19 +67,19 @@
             Orientation="Horizontal"
             HorizontalAlignment="Center"
             Margin="0,18,0,60">
-            <ghfvs:OcticonCircleButton
-                x:Name="okButton" 
-                TabIndex="2" 
-                Icon="check"
+            <Button
+                Style="{DynamicResource {x:Static ui:VsResourceKeys.ThemedDialogButtonStyleKey}}"
+                x:Name="okButton"
+                TabIndex="2"
                 IsDefault="True"
                 Content="{x:Static ghfvs:Resources.verifyText}"
                 AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticatonVerifyButton}" />
-            <ghfvs:OcticonLinkButton 
+            <Button 
+                Style="{DynamicResource {x:Static ui:VsResourceKeys.ThemedDialogButtonStyleKey}}"
                 x:Name="resendCodeButton"
                 TabIndex="3"
                 ToolTip="{x:Static ghfvs:Resources.resendCodeButtonToolTip}"
                 FontSize="12"
-                Icon="sync"
                 Margin="18,0,0,0"
                 Content="{x:Static ghfvs:Resources.resendCodeButtonContent}" />
         </StackPanel>