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

Commit c194acc

Browse files
committed
Fix OcticonButton and InfoPanel
1 parent c17c2fd commit c194acc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/GitHub.VisualStudio.UI/SharedDictionary.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<ResourceDictionary.MergedDictionaries>
88
<theme:ThemeDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/ThemeDesignTime.xaml"/>
99
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/ActionLinkButton.xaml"/>
10+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/OcticonButton.xaml"/>
1011
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubComboBox.xaml"/>
1112
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Buttons.xaml"/>
1213
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubTabControl.xaml"/>

src/GitHub.UI/Controls/Buttons/OcticonButton.xaml renamed to src/GitHub.VisualStudio.UI/Styles/OcticonButton.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:GitHub.UI">
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
2+
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
23

34
<Style x:Key="OcticonButton" TargetType="{x:Type ui:OcticonButton}">
45
<Setter Property="Focusable" Value="True"/>
5-
<Setter Property="Foreground" Value="Black"/>
66
<Setter Property="Height" Value="16"/>
77
<Setter Property="Width" Value="16"/>
88
<Setter Property="Margin" Value="0"/>

0 commit comments

Comments
 (0)