fix: Color inconsistency

AvaloniaUI · Feb 9, 2022 · e4c5504 · e4c5504
1 parent 3a15ed6
commit e4c5504
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/Citrus.Avalonia/Theme/ExpanderStyles.xaml b/src/Citrus.Avalonia/Theme/ExpanderStyles.xaml
@@ -41,4 +41,7 @@
     <Style Selector="Expander:down:expanded /template/ ToggleButton#PART_toggle /template/ Path">
         <Setter Property="Fill" Value="#ffffff" />
     </Style>
+    <Style Selector="Expander /template/ ToggleButton#PART_toggle TextBlock">
+        <Setter Property="Foreground" Value="#ffffff" />
+    </Style>
 </Styles>
diff --git a/src/Citrus.Avalonia/Theme/MenuStyles.xaml b/src/Citrus.Avalonia/Theme/MenuStyles.xaml
@@ -4,18 +4,20 @@
         <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
         <Setter Property="Background" Value="{DynamicResource ThemeCardBrush}" />
     </Style>
-    <Style Selector="MenuItem > AccessText">
+    <Style Selector="MenuItem">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="FontFamily" Value="Ubuntu" />
+        <Setter Property="Background" Value="{DynamicResource ThemeCardBrush}" />
     </Style>
-    <Style Selector="MenuItem:pointerover > AccessText">
+    <Style Selector="MenuItem:pointerover">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
-    <Style Selector="MenuItem:selected > AccessText">
+    <Style Selector="MenuItem:selected">
         <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
     </Style>
-    <Style Selector="MenuItem > MenuItem > AccessText">
-        <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
+    <Style Selector="MenuItem > MenuItem">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ThemeCardBrush}" />
     </Style>
     <Style Selector="MenuItem">
         <Setter Property="BorderThickness" Value="0"/>

diff --git a/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml b/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml
@@ -11,6 +11,12 @@
     <Style Selector="TextBox">
         <Setter Property="CornerRadius" Value="5" />
     </Style>
+    <Style Selector="ComboBox">
+        <Setter Property="CornerRadius" Value="5" />
+    </Style>
+    <Style Selector="NumericUpDown">
+        <Setter Property="CornerRadius" Value="5" />
+    </Style>
     <Style Selector="TextBox:pointerover /template/ Border">
         <Setter Property="Background" Value="{DynamicResource ThemeBorderMidBrush}" />
     </Style>