diff --git a/app/(root)/layout.tsx b/app/(root)/layout.tsx index 64758b4..0069033 100644 --- a/app/(root)/layout.tsx +++ b/app/(root)/layout.tsx @@ -3,11 +3,6 @@ import { DesktopTopBar } from "@/components/navigation/desktop-top-bar"; import { LeftSidebar } from "@/components/navigation/left-sidebar"; import { MobileTopBar } from "@/components/navigation/mobile-top-bar"; import { SidebarProvider } from "@/components/ui/sidebar"; -import { - cn, - LAYOUT_HORIZONTAL_PADDING, - MOBILE_TOP_BAR_OFFSET, -} from "@/lib/utils"; const RootLayout = async ({ children }: { children: React.ReactNode }) => { const cookieStore = await cookies(); @@ -16,25 +11,13 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => { return ( - {/* Mobile-only top bar */} - - - {/* Full-height sidebar */} {/* Main content area */}
- {/* Desktop-only top bar */} + -
- {children} -
+
{children}
); diff --git a/app/globals.css b/app/globals.css index 47a5b4a..9707fab 100644 --- a/app/globals.css +++ b/app/globals.css @@ -204,4 +204,9 @@ .invert-colors { @apply invert dark:invert-0; } + + /* Consistent horizontal padding for main content and top bar alignment */ + .layout-padding-x { + @apply px-6 md:px-8 lg:px-12; + } } diff --git a/components/navigation/desktop-top-bar.tsx b/components/navigation/desktop-top-bar.tsx index 7ec9d2e..65ddf30 100644 --- a/components/navigation/desktop-top-bar.tsx +++ b/components/navigation/desktop-top-bar.tsx @@ -1,15 +1,14 @@ import { SignedOut, SignInButton, SignUpButton } from "@clerk/nextjs"; import { ThemeToggle } from "@/components/navigation/theme-toggle"; import { Button } from "@/components/ui/button"; -import { cn, LAYOUT_HORIZONTAL_PADDING, TOP_BAR_HEIGHT } from "@/lib/utils"; +import { cn, TOP_BAR_HEIGHT } from "@/lib/utils"; export function DesktopTopBar() { return (