Skip to content

fix(theme): ensure navbar and menu item texts use primary black in li… #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehs22n merged 1 commit into from
Nov 10, 2026
Merged

fix(theme): ensure navbar and menu item texts use primary black in li… #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 48 additions & 13 deletions Components/Navigation/NavbarComponent.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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 -->
Expand All @@ -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) -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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"/>
Expand All @@ -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>

<!-- ========================================================================= -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>

Expand All @@ -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..."
Expand All @@ -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"
Expand Down Expand Up @@ -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}"
Expand Down
25 changes: 25 additions & 0 deletions Resources/ClassicStyles.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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}"/>
Expand Down
Loading