Merge pull request #676 from github/backport/fixes/634-update-button-style

Backport #634 into 2.1.0.

Author: shana

src/GitHub.VisualStudio.UI/Resources.Designer.cs

@@ -333,6 +333,9 @@
   <data name="filterBranchesText" xml:space="preserve">
     <value>Filter branches</value>
   </data>
+  <data name="PublishToGitHubButton" xml:space="preserve">
+    <value>Publish to GitHub</value>
+  </data>
   <data name="GetStartedLink" xml:space="preserve">
     <value>Get Started</value>
   </data>

src/GitHub.VisualStudio.UI/Resources.resx

@@ -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" />

src/GitHub.VisualStudio.UI/Styles/ThemeBlue.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" />

src/GitHub.VisualStudio.UI/Styles/ThemeDark.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" />

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

@@ -9,8 +9,7 @@
              mc:Ignorable="d"
              DataContext="{Binding ViewModel}" d:DesignWidth="230" d:DesignHeight="120"
              KeyboardNavigation.TabNavigation="Local"
-             Background="{DynamicResource GitHubVsToolWindowBackground}"
-  >
+             Background="{DynamicResource GitHubVsToolWindowBackground}">
 
     <UserControl.Style>
         <Style TargetType="{x:Type UserControl}">
@@ -30,6 +29,7 @@
                 <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,9 +74,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 ActionLinkButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click" Content="{x:Static prop:Resources.GetStartedLink}"
-                    Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            <Rectangle Grid.Column="4" Width="16" Height="16" Margin="8,0,0,0" Fill="{StaticResource ConnectArrowBrush}"
+            <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>