menu light theme better border brush

kikipoulet · Oct 10, 2024 · 4e69c25 · 4e69c25
1 parent fb25093
commit 4e69c25
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/SukiUI/ColorTheme/Dark.axaml b/SukiUI/ColorTheme/Dark.axaml
@@ -14,6 +14,7 @@
     <Color x:Key="SukiControlBorderBrush">#606060</Color>
     <Color x:Key="SukiMediumBorderBrush">#555555</Color>
     <Color x:Key="SukiLightBorderBrush">#454545</Color>
+    <Color x:Key="SukiMenuBorderBrush">#454545</Color>
     <Color x:Key="GlassBorderBrush">#252729</Color>
 
     <Color x:Key="SukiText">#edffffff</Color>

diff --git a/SukiUI/ColorTheme/Light.axaml b/SukiUI/ColorTheme/Light.axaml
@@ -14,6 +14,7 @@
     <Color x:Key="SukiControlBorderBrush">#cecece</Color>
     <Color x:Key="SukiMediumBorderBrush">#e2e2e2</Color>
     <Color x:Key="SukiLightBorderBrush">#f1f1f1</Color>
+    <Color x:Key="SukiMenuBorderBrush">#d7d7d7</Color>
     <Color x:Key="GlassBorderBrush">#e3e3e7</Color>
 
     <Color x:Key="SukiText">#222222</Color>

diff --git a/SukiUI/Theme/ContextMenu.axaml b/SukiUI/Theme/ContextMenu.axaml
@@ -2,7 +2,7 @@
     <ControlTheme x:Key="SukiContextMenuStyle" TargetType="ContextMenu">
         <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" />
         <Setter Property="CornerRadius" Value="6" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SukiLightBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SukiMenuBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template">
             <ControlTemplate>

diff --git a/SukiUI/Theme/Menu.axaml b/SukiUI/Theme/Menu.axaml
@@ -11,7 +11,7 @@
                 <Border Name="root"
                         Margin="5,5"
                         Background="{TemplateBinding Background}"
-                        BorderBrush="{DynamicResource SukiLightBorderBrush}"
+                        BorderBrush="{DynamicResource SukiMenuBorderBrush}"
                         BorderThickness="0"
                         CornerRadius="8">
                     <Panel>
@@ -49,7 +49,7 @@
                                     <Border Name="PART_Border"
                                             Margin="16,8,8,8"
                                             Background="{DynamicResource SukiCardBackground}"
-                                            BorderBrush="{DynamicResource SukiLightBorderBrush}"
+                                            BorderBrush="{DynamicResource SukiMenuBorderBrush}"
                                             BorderThickness="1"
                                             BoxShadow="{DynamicResource SukiPopupShadow}"
                                             ClipToBounds="True"

diff --git a/SukiUI/Theme/MenuFlyoutPresenter.axaml b/SukiUI/Theme/MenuFlyoutPresenter.axaml
@@ -2,7 +2,7 @@
     <ControlTheme x:Key="SukiMenuFlyoutPresenterStyle" TargetType="MenuFlyoutPresenter">
         <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" />
         <Setter Property="CornerRadius" Value="6" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SukiLightBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SukiMenuBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template">
             <ControlTemplate>

diff --git a/SukiUI/Theme/MenuItem.axaml b/SukiUI/Theme/MenuItem.axaml
@@ -7,6 +7,7 @@
     <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme x:Key="SukiMenuItemStyle" TargetType="MenuItem">
+
         <Setter Property="Background" Value="{DynamicResource SukiBackground}" />
         <Setter Property="BorderThickness" Value="1.5" />
         <Setter Property="FontSize" Value="14" />
@@ -77,7 +78,7 @@
                                     <Border Name="PART_Border"
                                             Margin="16,8,8,8"
                                             Background="{DynamicResource SukiCardBackground}"
-                                            BorderBrush="{DynamicResource SukiLightBorderBrush}"
+                                            BorderBrush="{DynamicResource SukiMenuBorderBrush}"
                                             BorderThickness="1"
                                             BoxShadow="{DynamicResource SukiPopupShadow}"
                                             ClipToBounds="True"