Skip to content

Tweak layout component #42

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
buberdds merged 2 commits into from
Jul 3, 2025
Merged

Tweak layout component #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4eb522
Remove mobile margin from header
buberdds Jul 3, 2025
26766c2
Pass className to Layout component
buberdds Jul 3, 2025
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
7 changes: 5 additions & 2 deletions src/components/ui/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import { FC, PropsWithChildren, ReactNode } from 'react'
import { SidebarProvider, SidebarTrigger } from './sidebar'
import { useIsMobile } from '../../hooks'
import { Separator } from './separator'
import { cn } from '../../lib/utils'

const Header: FC<PropsWithChildren> = ({ children }) => (
<header className="mt-12 md:mt-0 sticky md:static z-50 top-0">
<header className="mt-0 sticky md:static z-50 top-0">
<nav className="md:h-16 px-3 md:px-6 py-2.5 bg-background border-b border-border shadow-sm flex items-center">
<div className="w-full max-w-[96rem] mx-auto flex">{children}</div>
</nav>
Expand Down Expand Up @@ -44,6 +45,7 @@ interface LayoutProps {
headerBreadcrumbsContent?: ReactNode
footerContent?: ReactNode
sidebar?: ReactNode
className?: string
}

export const Layout: FC<PropsWithChildren<LayoutProps>> = ({
Expand All @@ -52,11 +54,12 @@ export const Layout: FC<PropsWithChildren<LayoutProps>> = ({
headerBreadcrumbsContent,
footerContent,
sidebar,
className,
}) => {
const isMobile = useIsMobile()

const layoutContent = (
<div className="w-full max-w-[96rem] mx-auto flex flex-col min-h-[800px] md:max-h-dvh">
<div className={cn('w-full max-w-[96rem] mx-auto flex flex-col min-h-[800px] md:max-h-dvh', className)}>
{headerContent && <Header>{headerContent}</Header>}

{isMobile && (
Expand Down