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

Commit 67f349d

Browse files
committed
Stop using GitHubBlueLinkButton
1 parent bb93e21 commit 67f349d

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/GitHub.UI/Assets/Controls.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
mc:Ignorable="d">
77

88
<ResourceDictionary.MergedDictionaries>
9-
<ResourceDictionary Source="Controls/GitHubLinkButton.xaml" />
109
<ResourceDictionary Source="Controls/ScrollViewerWithShadow.xaml" />
1110
<ResourceDictionary Source="../Controls/Octicons/OcticonImage.xaml" />
1211
</ResourceDictionary.MergedDictionaries>

src/GitHub.VisualStudio.UI/SharedDictionary.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/OcticonButton.xaml"/>
1111
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubComboBox.xaml"/>
1212
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Buttons.xaml"/>
13+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubLinkButton.xaml"/>
1314
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubTabControl.xaml"/>
1415
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/TextBlocks.xaml"/>
1516
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/FilterTextBox.xaml"/>

src/GitHub.UI/Assets/Controls/GitHubLinkButton.xaml renamed to src/GitHub.VisualStudio.UI/Styles/GitHubLinkButton.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
23
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
34

4-
<Style x:Key="GitHubBlueLinkButton" TargetType="{x:Type ButtonBase}">
5-
<Setter Property="Foreground" Value="{DynamicResource GHBlueLinkButtonTextBrush}" />
6-
<Setter Property="BorderBrush" Value="{DynamicResource GHBlueLinkButtonTextBrush}" />
5+
<Style x:Key="GitHubLinkButton" TargetType="{x:Type ButtonBase}">
6+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.HyperlinkBrushKey}}" />
7+
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vs:ThemedDialogColors.HyperlinkBrushKey}}" />
78
<Setter Property="FontFamily" Value="{DynamicResource GitHubFontFamilyNormal}" />
89
<Setter Property="FontSize" Value="12" />
910
<Setter Property="FocusVisualStyle" Value="{DynamicResource NegativeMarginFocusVisual}" />
@@ -25,10 +26,10 @@
2526
</Grid>
2627
<ControlTemplate.Triggers>
2728
<Trigger Property="IsMouseOver" Value="True">
28-
<Setter Property="Foreground" Value="{DynamicResource GHBlueLinkButtonHoverBrush}" />
29+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.HyperlinkHoverBrushKey}}" />
2930
</Trigger>
3031
<Trigger Property="IsPressed" Value="True">
31-
<Setter Property="Foreground" Value="{DynamicResource GHBlueLinkButtonPressedBrush}" />
32+
<Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.HyperlinkPressedBrushKey}}" />
3233
</Trigger>
3334
</ControlTemplate.Triggers>
3435
</ControlTemplate>

src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Label DockPanel.Dock="Left" Content="{x:Static ghfvs:Resources.localPathText}"/>
4343
<Button DockPanel.Dock="Right"
4444
Command="{Binding Browse}"
45-
Style="{DynamicResource GitHubBlueLinkButton}"
45+
Style="{DynamicResource GitHubLinkButton}"
4646
VerticalContentAlignment="Center">
4747
Browse
4848
</Button>

src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
VerticalContentAlignment="Center"
156156
Content="{x:Static ghfvs:Resources.browsePathButtonContent}"
157157
Padding="0"
158-
Style="{StaticResource GitHubBlueLinkButton}"
158+
Style="{DynamicResource GitHubLinkButton}"
159159
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.CreateRepositoryLocalPathBrowseButton}" />
160160
</Grid>
161161

0 commit comments

Comments
 (0)