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

Commit 7a334de

Browse files
committed
Source the SharedDictionary correctly
1 parent b82afff commit 7a334de

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/GitHub.VisualStudio/Styles/GitHubComboBox.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
34
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
5+
6+
<ResourceDictionary.MergedDictionaries>
7+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
8+
</ResourceDictionary.MergedDictionaries>
49

510
<Style x:Key="GitHubComboBoxBorder" TargetType="{x:Type Border}">
611
<Setter Property="Margin" Value="10" />
@@ -25,7 +30,6 @@
2530
<Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
2631
</Style>
2732

28-
2933
<Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Type Separator}}">
3034
<Setter Property="Background" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
3135
<Setter Property="Margin" Value="0" />

0 commit comments

Comments
 (0)