From 01ace1b21787ed4f0bb6fc8a0f0dfdee4a4712b4 Mon Sep 17 00:00:00 2001
From: Lamparter <71598437+Lamparter@users.noreply.github.com>
Date: Fri, 14 Mar 2025 17:52:41 +0000
Subject: [PATCH] Comment out merged dictionaries temporarily

---
 src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml | 4 ++--
 src/core/Riverside.GlowUI.Styles/InfoBar.xaml        | 4 ++--
 src/core/Riverside.GlowUI.Styles/TextBox.xaml        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml b/src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml
index 3351c0a..ad0dd9e 100644
--- a/src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml
+++ b/src/core/Riverside.GlowUI.Styles/GlowGradientUI.xaml
@@ -7,10 +7,10 @@
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:muxcmedia="Microsoft.UI.Xaml.Media"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
-    <ResourceDictionary.MergedDictionaries>
+    <!--<ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Riverside.Toolkit/Styles/CubeThemeDictionary.xaml" />
         <ResourceDictionary Source="ms-appx:///Riverside.Toolkit/Styles/CubeUI.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary.MergedDictionaries>-->
     <Style x:Key="ToolbarButton" TargetType="Button">
         <Setter Property="Foreground" Value="{ThemeResource SplitButtonForeground}" />
         <Setter Property="Background" Value="Transparent" />
diff --git a/src/core/Riverside.GlowUI.Styles/InfoBar.xaml b/src/core/Riverside.GlowUI.Styles/InfoBar.xaml
index ecf5612..327a1a4 100644
--- a/src/core/Riverside.GlowUI.Styles/InfoBar.xaml
+++ b/src/core/Riverside.GlowUI.Styles/InfoBar.xaml
@@ -5,10 +5,10 @@
     xmlns:controls="using:Microsoft.UI.Xaml.Controls"
     xmlns:glow="using:Riverside.Toolkit.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
-    <ResourceDictionary.MergedDictionaries>
+    <!--<ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Riverside.Toolkit.Buttons/Buttons.xaml" />
         <ResourceDictionary Source="ms-appx:///Riverside.Toolkit.Brushes/MicaBrushes.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary.MergedDictionaries>-->
     <Style TargetType="controls:InfoBar">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="IsClosable" Value="True" />
diff --git a/src/core/Riverside.GlowUI.Styles/TextBox.xaml b/src/core/Riverside.GlowUI.Styles/TextBox.xaml
index 41ce19c..0d58262 100644
--- a/src/core/Riverside.GlowUI.Styles/TextBox.xaml
+++ b/src/core/Riverside.GlowUI.Styles/TextBox.xaml
@@ -2,9 +2,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ToolkitControls="using:Riverside.Toolkit.Controls">
-    <ResourceDictionary.MergedDictionaries>
+    <!--<ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Cube.UI/Brushes/StyleBrushes.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary.MergedDictionaries>-->
     <Style x:Key="GlowTextBox" TargetType="TextBox">
         <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
         <Setter Property="Background" Value="{ThemeResource SortHvidBrush}" />