Skip to content

Commit 921db39

Browse files
authored
Fix: Commented out merged dictionaries in GlowUI (#120)
1 parent 6ef9334 commit 921db39

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
88
xmlns:muxcmedia="Microsoft.UI.Xaml.Media"
99
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
10-
<ResourceDictionary.MergedDictionaries>
10+
<!--<ResourceDictionary.MergedDictionaries>
1111
<ResourceDictionary Source="ms-appx:///Riverside.Toolkit/Styles/CubeThemeDictionary.xaml" />
1212
<ResourceDictionary Source="ms-appx:///Riverside.Toolkit/Styles/CubeUI.xaml" />
13-
</ResourceDictionary.MergedDictionaries>
13+
</ResourceDictionary.MergedDictionaries>-->
1414
<Style x:Key="ToolbarButton" TargetType="Button">
1515
<Setter Property="Foreground" Value="{ThemeResource SplitButtonForeground}" />
1616
<Setter Property="Background" Value="Transparent" />

src/core/Riverside.GlowUI.Styles/InfoBar.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
xmlns:controls="using:Microsoft.UI.Xaml.Controls"
66
xmlns:glow="using:Riverside.Toolkit.Controls"
77
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
8-
<ResourceDictionary.MergedDictionaries>
8+
<!--<ResourceDictionary.MergedDictionaries>
99
<ResourceDictionary Source="ms-appx:///Riverside.Toolkit.Buttons/Buttons.xaml" />
1010
<ResourceDictionary Source="ms-appx:///Riverside.Toolkit.Brushes/MicaBrushes.xaml" />
11-
</ResourceDictionary.MergedDictionaries>
11+
</ResourceDictionary.MergedDictionaries>-->
1212
<Style TargetType="controls:InfoBar">
1313
<Setter Property="IsTabStop" Value="False" />
1414
<Setter Property="IsClosable" Value="True" />

src/core/Riverside.GlowUI.Styles/TextBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:ToolkitControls="using:Riverside.Toolkit.Controls">
5-
<ResourceDictionary.MergedDictionaries>
5+
<!--<ResourceDictionary.MergedDictionaries>
66
<ResourceDictionary Source="ms-appx:///Cube.UI/Brushes/StyleBrushes.xaml" />
7-
</ResourceDictionary.MergedDictionaries>
7+
</ResourceDictionary.MergedDictionaries>-->
88
<Style x:Key="GlowTextBox" TargetType="TextBox">
99
<Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
1010
<Setter Property="Background" Value="{ThemeResource SortHvidBrush}" />

0 commit comments

Comments
 (0)