Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit a5580ae

Browse files
committed
Update primary button hover styles
1 parent de850c5 commit a5580ae

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/GitHub.VisualStudio/Styles/Buttons.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
<Setter Property="BorderBrush" Value="{DynamicResource GitHubPrimaryButtonBorderBrush}" />
101101
<Setter Property="Foreground" Value="{DynamicResource GitHubPrimaryButtonForegroundBrush}" />
102102
<Setter Property="FontFamily" Value="{DynamicResource GitHubFontFamilyNormal}" />
103-
<Setter Property="FontWeight" Value="Bold" />
104103
<Setter Property="Padding" Value="12,5" />
105104
<Setter Property="Margin" Value="0" />
106105
<Setter Property="MinWidth" Value="76" />
@@ -156,8 +155,8 @@
156155
<Rectangle x:Name="DisabledVisualElement"
157156
Fill="{DynamicResource GitHubPrimaryButtonBackgroundDisabledBrush}" SnapsToDevicePixels="True" IsHitTestVisible="false"
158157
Opacity="0" />
159-
<Border x:Name="MouseOverBorder" BorderBrush="#FF6ba157"
160-
Background="#FF71BD1E"
158+
<Border x:Name="MouseOverBorder" BorderBrush="{DynamicResource GitHubPrimaryButtonBorderMouseOverBrush}"
159+
Background="{DynamicResource GitHubPrimaryButtonBackgroundMouseOverBrush}"
161160
BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True" Opacity="0" />
162161
<Border x:Name="PressedBorder" BorderBrush="{DynamicResource GitHubPrimaryButtonBorderPressedBrush}"
163162
Background="#FF55A532"

src/GitHub.VisualStudio/Styles/ThemeBlue.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
3232
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
3333

34-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF7ED321" />
34+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF6FBF00" />
3535
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FFFAFAFA" />
3636
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundDisabledBrush" Color="#FF9B9B9B" />
3737
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderDisabledBrush" Color="#FFD4D4D4" />
38-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF90D96F" />
38+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF7ED900" />
3939
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundPressedBrush" Color="#FF7FBF62" />
4040
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundBrush" Color="#FFFFFFFF" />
41-
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF599942" />
41+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF54B02C" />
4242
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderMouseOverBrush" Color="#FF68B34D" />
4343
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderPressedBrush" Color="#FF599942" />
4444

src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,11 @@
298298
<ColumnDefinition Width="Auto" />
299299
</Grid.ColumnDefinitions>
300300

301-
<!--
302301
<Button Grid.Column="0"
303302
HorizontalAlignment="Right"
304303
Content="Cancel"
305304
Style="{StaticResource GitHubVsButton}"
306305
Command="{Binding Cancel}"/>
307-
-->
308306
<Button HorizontalAlignment="Right" Margin="6,0,0,0" Content="Create pull request" Grid.Column="1" Style="{StaticResource GitHubVsPrimaryActionButton}" />
309307
</Grid>
310308
</StackPanel>

0 commit comments

Comments
 (0)