From 1faeb94438871a8c9caf493003a4df07f8890fb1 Mon Sep 17 00:00:00 2001
From: ehsan amiri <ehsan.amiri.prog@gmail.com>
Date: Tue, 10 Nov 2026 12:17:25 +0330
Subject: [PATCH] fix(theme): ensure navbar and menu item texts use primary
 black in light mode

---
 Components/Navigation/NavbarComponent.axaml | 61 ++++++++++++++++-----
 Resources/ClassicStyles.axaml               | 25 +++++++++
 2 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/Components/Navigation/NavbarComponent.axaml b/Components/Navigation/NavbarComponent.axaml
index c5b4e08..838242f 100644
--- a/Components/Navigation/NavbarComponent.axaml
+++ b/Components/Navigation/NavbarComponent.axaml
@@ -58,7 +58,7 @@
         <!-- Hamburger Menu Toggle Button Styling -->
         <Style Selector="Button.hamburger-btn">
             <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Foreground" Value="{DynamicResource AppTextSecondaryBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
             <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="CornerRadius" Value="4"/>
@@ -71,12 +71,15 @@
         <Style Selector="Button.hamburger-btn:pointerover">
             <Setter Property="Background" Value="{DynamicResource AppToolHoverBrush}"/>
             <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource AppAccentBrush}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderDarkBrush}"/>
         </Style>
         <Style Selector="Button.hamburger-btn.active-menu">
             <Setter Property="Background" Value="{DynamicResource AppToolHoverBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource AppAccentBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource AppAccentBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderDarkBrush}"/>
+        </Style>
+        <Style Selector="Button.hamburger-btn PathIcon.hamburger-icon">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
         </Style>
 
         <!-- GPU-Accelerated Hamburger Icon Transform Pipeline -->
@@ -91,7 +94,7 @@
         </Style>
         <Style Selector="Button.hamburger-btn.active-menu PathIcon.hamburger-icon">
             <Setter Property="RenderTransform" Value="rotate(90deg)"/>
-            <Setter Property="Foreground" Value="{DynamicResource AppAccentBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
         </Style>
 
         <!-- Animated Navbar Menu Items Container (Closed / Base State) -->
@@ -155,7 +158,39 @@
         </Style>
         <Style Selector="Menu.navbar-menu-strip > MenuItem:open">
             <Setter Property="Background" Value="{DynamicResource AppSurfaceBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource AppAccentBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+        </Style>
+
+        <!-- Dropdown Menu Items inside Navbar Menu Strip (Strict High-Contrast Black in Light Mode) -->
+        <Style Selector="Menu.navbar-menu-strip MenuItem">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+            <Setter Property="Cursor" Value="Hand"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem:pointerover">
+            <Setter Property="Background" Value="{DynamicResource AppToolHoverBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem:selected">
+            <Setter Property="Background" Value="{DynamicResource AppToolHoverBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem:open">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem TextBlock">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem /template/ TextBlock#PART_InputGestureText">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextSecondaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem ui|FASymbolIcon">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextSecondaryBrush}"/>
+        </Style>
+        <Style Selector="Menu.navbar-menu-strip MenuItem:pointerover ui|FASymbolIcon">
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
         </Style>
 
         <!-- GPU-Accelerated Micro-Interactions on Top-Level Menu Items -->
@@ -190,7 +225,7 @@
         <!-- Compact Action Button in Title Bar -->
         <Style Selector="Button.titlebar-action-btn">
             <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Foreground" Value="{DynamicResource AppTextSecondaryBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
             <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="CornerRadius" Value="4"/>
@@ -203,7 +238,7 @@
         <Style Selector="Button.titlebar-action-btn:pointerover">
             <Setter Property="Background" Value="{DynamicResource AppToolHoverBrush}"/>
             <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource AppAccentBrush}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderDarkBrush}"/>
         </Style>
 
         <!-- ========================================================================= -->
@@ -374,7 +409,7 @@
                         <!-- Database Management & Tools Menu -->
                         <MenuItem x:Name="MenuDatabase" Classes="nav-item nav-item-3" Header="Database" FontSize="11">
                             <MenuItem.Icon>
-                                <ui:FASymbolIcon Symbol="Folder" FontSize="11" Foreground="{DynamicResource AppAccentBrush}"/>
+                                <ui:FASymbolIcon Symbol="Folder" FontSize="11" />
                             </MenuItem.Icon>
 
                             <!-- Connection Management -->
@@ -411,7 +446,7 @@
                             <MenuItem Header="Create Excel from Table (*.xlsx)..." 
                                       Command="{Binding $parent[TopLevel].((vm:MainViewModel)DataContext).QuickExportExcelCommand}">
                                 <MenuItem.Icon>
-                                    <ui:FASymbolIcon Symbol="Document" FontSize="11" Foreground="#10B981"/>
+                                    <ui:FASymbolIcon Symbol="Document" FontSize="11" />
                                 </MenuItem.Icon>
                             </MenuItem>
 
@@ -421,7 +456,7 @@
                             <MenuItem Header="Backup Database (.sql dump)..." 
                                       Command="{Binding $parent[TopLevel].((vm:MainViewModel)DataContext).BackupDatabaseCommand}">
                                 <MenuItem.Icon>
-                                    <ui:FASymbolIcon Symbol="Save" FontSize="11" Foreground="#38BDF8"/>
+                                    <ui:FASymbolIcon Symbol="Save" FontSize="11" />
                                 </MenuItem.Icon>
                             </MenuItem>
                             <MenuItem Header="Restore Database from Backup..." 
@@ -437,7 +472,7 @@
                             <MenuItem Header="ER Diagram &amp; Schema Relations..." 
                                       Command="{Binding $parent[TopLevel].((vm:MainViewModel)DataContext).OpenDiagramModalCommand}">
                                 <MenuItem.Icon>
-                                    <ui:FASymbolIcon Symbol="Preview" FontSize="11" Foreground="#F59E0B"/>
+                                    <ui:FASymbolIcon Symbol="Preview" FontSize="11" />
                                 </MenuItem.Icon>
                             </MenuItem>
                             <MenuItem Header="View Table Schema &amp; Properties" 
@@ -602,7 +637,7 @@
                             Padding="4,0" 
                             VerticalAlignment="Center">
                         <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
-                            <ui:FASymbolIcon Symbol="Folder" FontSize="10" Foreground="{DynamicResource AppAccentBrush}" VerticalAlignment="Center"/>
+                            <ui:FASymbolIcon Symbol="Folder" FontSize="10" Foreground="{DynamicResource AppTextSecondaryBrush}" VerticalAlignment="Center"/>
                             <TextBlock Classes="db-label-text" Text="DB:" FontSize="9" FontWeight="SemiBold" Foreground="{DynamicResource AppTextSecondaryBrush}" VerticalAlignment="Center"/>
                             <ComboBox ItemsSource="{Binding $parent[TopLevel].((vm:MainViewModel)DataContext).AvailableTargetDatabases}"
                                       SelectedItem="{Binding $parent[TopLevel].((vm:MainViewModel)DataContext).SelectedTargetDatabase}"
diff --git a/Resources/ClassicStyles.axaml b/Resources/ClassicStyles.axaml
index 3003126..8990390 100644
--- a/Resources/ClassicStyles.axaml
+++ b/Resources/ClassicStyles.axaml
@@ -68,12 +68,27 @@
         <Setter Property="FocusAdorner" Value="{x:Null}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
     </Style>
     <Style Selector="MenuItem:pointerover">
         <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="MenuItem:selected">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="MenuItem:open">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="MenuItem /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="MenuItem /template/ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextSecondaryBrush}"/>
     </Style>
     <Style Selector="MenuItem:disabled">
         <Setter Property="Cursor" Value="Arrow"/>
+        <Setter Property="Foreground" Value="{DynamicResource AppTextMutedBrush}"/>
     </Style>
     <Style Selector="MenuItem /template/ Border#PART_LayoutRoot">
         <Setter Property="BorderThickness" Value="0"/>
@@ -101,6 +116,16 @@
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="FocusAdorner" Value="{x:Null}"/>
         <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="Menu > MenuItem:pointerover">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="Menu > MenuItem:selected">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="Menu > MenuItem:open">
+        <Setter Property="Foreground" Value="{DynamicResource AppTextPrimaryBrush}"/>
     </Style>
     <Style Selector="Menu > MenuItem:pointerover /template/ Border#PART_LayoutRoot">
         <Setter Property="Background" Value="{DynamicResource AppToolHoverBrush}"/>