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

Commit de850c5

Browse files
committed
Try out a new disabled style
1 parent ac0edec commit de850c5

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

src/GitHub.VisualStudio/Styles/Buttons.xaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,10 @@
178178
</Trigger>
179179

180180
<Trigger Property="IsEnabled" Value="False">
181-
<Setter Property="Opacity" Value="0.6" />
181+
<Setter Property="BorderBrush" Value="{DynamicResource GitHubPrimaryButtonBorderDisabledBrush}" />
182+
<Setter Property="Foreground" Value="{DynamicResource GitHubPrimaryButtonForegroundDisabledBrush}" />
183+
<Setter Property="Background" Value="{DynamicResource GitHubPrimaryButtonBackgroundDisabledBrush}" />
184+
<Setter Property="FontWeight" Value="Normal" />
182185
</Trigger>
183186
</ControlTemplate.Triggers>
184187
</ControlTemplate>

src/GitHub.VisualStudio/Styles/ThemeBlue.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
3333

3434
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF7ED321" />
35-
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF7ED321" Opacity="0.3" />
35+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FFFAFAFA" />
36+
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundDisabledBrush" Color="#FF9B9B9B" />
37+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderDisabledBrush" Color="#FFD4D4D4" />
3638
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF90D96F" />
3739
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundPressedBrush" Color="#FF7FBF62" />
3840
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundBrush" Color="#FFFFFFFF" />

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

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

301+
<!--
301302
<Button Grid.Column="0"
302303
HorizontalAlignment="Right"
303304
Content="Cancel"
304305
Style="{StaticResource GitHubVsButton}"
305306
Command="{Binding Cancel}"/>
307+
-->
306308
<Button HorizontalAlignment="Right" Margin="6,0,0,0" Content="Create pull request" Grid.Column="1" Style="{StaticResource GitHubVsPrimaryActionButton}" />
307309
</Grid>
308310
</StackPanel>

0 commit comments

Comments
 (0)