Update foreground color of no-image button

christopher-rtf · christopher-rtf · commit 6c0b5d97c3c8 · 2024-08-18T19:11:13.000-04:00
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>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`ShowActivated="False"`
`13`	`13`	`d:DataContext="{d:DesignInstance ui:ExpanderWindow}"`
`14`	`14`	`>`
`15`		`- <Expander x:Name="Expander" ExpandDirection="Right" Expanded="Expander_OnExpanded" Collapsed="Expander_OnExpanded" >`
	`15`	`+ <Expander x:Name="Expander" ExpandDirection="Right" Expanded="Expander_OnExpanded" Collapsed="Expander_OnExpanded">`
`16`	`16`	`<Expander.LayoutTransform>`
`17`	`17`	`<ScaleTransform ScaleX="{Binding Scale}" ScaleY="{Binding Scale}"></ScaleTransform>`
`18`	`18`	`</Expander.LayoutTransform>`