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

Commit 486064a

Browse files
committed
Merge ui/primary-button into release/1.0.99.7
2 parents 79bb6ca + ac0edec commit 486064a

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/GitHub.VisualStudio/Styles/Buttons.xaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@
8383
<Trigger Property="IsKeyboardFocused" Value="True">
8484
<Setter Property="Opacity" Value="1" TargetName="DefaultVisualElement" />
8585
</Trigger>
86+
87+
<Trigger Property="IsEnabled" Value="False">
88+
<Setter Property="Opacity" Value="0.6" />
89+
</Trigger>
8690
</ControlTemplate.Triggers>
8791
</ControlTemplate>
8892
</Setter.Value>
@@ -96,6 +100,7 @@
96100
<Setter Property="BorderBrush" Value="{DynamicResource GitHubPrimaryButtonBorderBrush}" />
97101
<Setter Property="Foreground" Value="{DynamicResource GitHubPrimaryButtonForegroundBrush}" />
98102
<Setter Property="FontFamily" Value="{DynamicResource GitHubFontFamilyNormal}" />
103+
<Setter Property="FontWeight" Value="Bold" />
99104
<Setter Property="Padding" Value="12,5" />
100105
<Setter Property="Margin" Value="0" />
101106
<Setter Property="MinWidth" Value="76" />
@@ -171,6 +176,10 @@
171176
<Trigger Property="IsKeyboardFocused" Value="True">
172177
<Setter Property="Opacity" Value="1" TargetName="DefaultVisualElement" />
173178
</Trigger>
179+
180+
<Trigger Property="IsEnabled" Value="False">
181+
<Setter Property="Opacity" Value="0.6" />
182+
</Trigger>
174183
</ControlTemplate.Triggers>
175184
</ControlTemplate>
176185
</Setter.Value>

src/GitHub.VisualStudio/Styles/ThemeBlue.xaml

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

34-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF8BD26B" />
35-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF8BD26B" Opacity="0.3" />
34+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF7ED321" />
35+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF7ED321" Opacity="0.3" />
3636
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF90D96F" />
3737
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundPressedBrush" Color="#FF7FBF62" />
3838
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundBrush" Color="#FFFFFFFF" />

src/GitHub.VisualStudio/Styles/ThemeLight.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
3434

35-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF8BD26B" />
36-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF8BD26B" Opacity="0.3" />
35+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF7ED321" />
36+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF7ED321" Opacity="0.3" />
3737
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF90D96F" />
3838
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundPressedBrush" Color="#FF7FBF62" />
3939
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundBrush" Color="#FFFFFFFF" />

0 commit comments

Comments
 (0)