From 342d168ed6cb681ee389782c1531f21d12a32d8b Mon Sep 17 00:00:00 2001
From: Jasmine Greenaway <jasminegweb@gmail.com>
Date: Mon, 24 Oct 2016 22:17:58 -0400
Subject: [PATCH] change button style name and tweak themes

---
 src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml          | 4 ++--
 src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml          | 4 ++--
 src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml         | 8 ++++----
 .../UI/Views/GitHubInvitationContent.xaml                 | 3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml b/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml
index b7eb0f6b6e..3cba4cf2ad 100644
--- a/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml
+++ b/src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml
@@ -23,10 +23,10 @@
   <SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
 
   <SolidColorBrush x:Key="GitHubButtonBackgroundBrush" Color="#FFECECF1" />
-  <SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FFDDDDE6" />
+  <SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FFFFFF" />
   <SolidColorBrush x:Key="GitHubButtonBackgroundPressedBrush" Color="#FFCFCFDB" />
   <SolidColorBrush x:Key="GitHubButtonBackgroundDisabledBrush" Color="#FFFCFCFC" />
-  <SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FF666666" />
+  <SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#1E1E1E" />
   <SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FFCACACA" />
   <SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
   <SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
diff --git a/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml b/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml
index 26b7f37006..b9dab14bca 100644
--- a/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml
+++ b/src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml
@@ -23,12 +23,12 @@
   <SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
 
   <SolidColorBrush x:Key="GitHubButtonBackgroundBrush" Color="#FF3F404B" />
-  <SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FF4B4C59" />
+  <SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#54545C" />
   <SolidColorBrush x:Key="GitHubButtonBackgroundPressedBrush" Color="#FF2F3038" />
   <SolidColorBrush x:Key="GitHubButtonBackgroundDisabledBrush" Color="#FF3F404B" Opacity="0.3"/>
   <SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FFF1F1F1" />
   <SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FF464646" />
-  <SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FF595959" />
+  <SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#65656F" />
   <SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FF2F3038" />
 
   <SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF709946" />
diff --git a/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml b/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml
index 3786e9b8f3..f93426fe32 100644
--- a/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml
+++ b/src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml
@@ -23,12 +23,12 @@
   <SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
 
   <SolidColorBrush x:Key="GitHubButtonBackgroundBrush" Color="#FFECECF1" />
-  <SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FFDDDDE6" />
+  <SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#CADEF4" />
   <SolidColorBrush x:Key="GitHubButtonBackgroundPressedBrush" Color="#FFCFCFDB" />
   <SolidColorBrush x:Key="GitHubButtonBackgroundDisabledBrush" Color="#FFFCFCFC" />
-  <SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FF666666" />
-  <SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FFCACACA" />
-  <SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
+  <SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#1E1E1E" />
+  <SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#D1D3DE" />
+  <SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#D1D3DE" />
   <SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
 
   <SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF7ED321" />
diff --git a/src/GitHub.VisualStudio.UI/UI/Views/GitHubInvitationContent.xaml b/src/GitHub.VisualStudio.UI/UI/Views/GitHubInvitationContent.xaml
index 5b33a0c6d3..eb1628437d 100644
--- a/src/GitHub.VisualStudio.UI/UI/Views/GitHubInvitationContent.xaml
+++ b/src/GitHub.VisualStudio.UI/UI/Views/GitHubInvitationContent.xaml
@@ -29,7 +29,6 @@
                 <cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <ui:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            <Style x:Key="VSStyledButton" BasedOn="{StaticResource VsButtonStyleKey}" TargetType="{x:Type Button}"/>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -74,7 +73,7 @@
                    Foreground="{DynamicResource GitHubVsToolWindowText}" />
             <Button Grid.Column="2" KeyboardNavigation.TabIndex="1" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="signup" Click="signup_Click" Content="{x:Static prop:Resources.SignUpLink}"
                     Visibility="{Binding ShowSignup, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            <Button Grid.Column="3" KeyboardNavigation.TabIndex="2" Style="{StaticResource VSStyledButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click" Content="{x:Static prop:Resources.PublishToGitHubButton}"
+            <Button Grid.Column="3" KeyboardNavigation.TabIndex="2" Style="{DynamicResource GitHubVsButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click" Content="{x:Static prop:Resources.PublishToGitHubButton}"
                     Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}"/>
         </Grid>