diff --git a/src/components/Logo.jsx b/src/components/Logo.jsx index 4564b68..f2ac0c2 100644 --- a/src/components/Logo.jsx +++ b/src/components/Logo.jsx @@ -1,7 +1,8 @@ // ==============================|| DOORMILE WORDMARK LOGO ||============================== // // Uses the brand wordmark asset (white PNG). `onDark` shows it as-is on dark/red // surfaces; on light surfaces it is recoloured to near-black. `compact` (e.g. the -// navbar) renders the square navbar mark instead, since the wordmark won't fit. +// collapsed navbar rail) pairs the round navbar mark with a "Doormile" text +// wordmark instead, since the full wordmark image is too wide to fit there. const LOGO_SRC = '/Doormile-logo.png'; const NAVBAR_MARK_SRC = '/navbarLogo.png'; @@ -9,18 +10,48 @@ const NAVBAR_MARK_SRC = '/navbarLogo.png'; export default function Logo({ onDark = false, compact = false, height = 26, size = 64, style = {} }) { if (compact) { return ( -
+
Doormile + + Doormile +
); } diff --git a/src/layout/MainLayout/Header.jsx b/src/layout/MainLayout/Header.jsx index a20ae17..7c60a7b 100644 --- a/src/layout/MainLayout/Header.jsx +++ b/src/layout/MainLayout/Header.jsx @@ -47,10 +47,6 @@ export default function Header({ isSidebarCollapsed }) { compact={isSidebarCollapsed} size={isSidebarCollapsed ? 36 : 32} height={28} - // Scaling visually enlarges the mark without growing its layout - // box, so the navbar row keeps its original width/height instead - // of stretching taller every time the logo gets bigger. - style={isSidebarCollapsed ? { transform: 'scale(1.4)' } : undefined} /> } headingHref="/dashboard"