Merge pull request #393 from raisingthefloor/christopher/darkmode2

Update foreground color of no-image button
raisingthefloor · Aug 18, 2024 · 4747b9f · 4747b9f
2 parents 89ade19 + 6c0b5d9
commit 4747b9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Morphic.Client/Bar/UI/BarControls/ButtonBarControl.xaml b/Morphic.Client/Bar/UI/BarControls/ButtonBarControl.xaml
@@ -89,7 +89,7 @@
                 MaxLines="{Binding Bar.Sizes.ButtonTextLines}" 
                 FontWeight="{Binding Bar.Sizes.ButtonFontWeight}"
                 FontSize="{Binding Bar.Sizes.ButtonFontSize}"
-                Foreground="{DynamicResource ThemeAwareForeground}"
+                Foreground="White"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Padding="10 0 10 0"

diff --git a/Morphic.Client/Bar/UI/ExpanderWindow.xaml b/Morphic.Client/Bar/UI/ExpanderWindow.xaml
@@ -12,7 +12,7 @@
         ShowActivated="False"
         d:DataContext="{d:DesignInstance ui:ExpanderWindow}"
         >
-    <Expander x:Name="Expander" ExpandDirection="Right" Expanded="Expander_OnExpanded" Collapsed="Expander_OnExpanded" >
+    <Expander x:Name="Expander" ExpandDirection="Right" Expanded="Expander_OnExpanded" Collapsed="Expander_OnExpanded">
         <Expander.LayoutTransform>
             <ScaleTransform ScaleX="{Binding Scale}" ScaleY="{Binding Scale}"></ScaleTransform>
         </Expander.LayoutTransform>