Skip to content

Commit 5970244

Browse files
authored
Merge pull request #51 from oasisprotocol/ml/layout-use-full-width-and-height
Layout: Use full width and height
2 parents 0ea85e3 + 4f1ce6b commit 5970244

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/components/ui/layout.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { cn } from '../../lib/utils'
77
const Header: FC<PropsWithChildren> = ({ children }) => (
88
<header className="mt-0 sticky md:static z-50 top-0">
99
<nav className="md:h-16 px-3 md:px-6 py-2.5 bg-background border-b border-border shadow-sm flex items-center">
10-
<div className="w-full max-w-[96rem] mx-auto flex">{children}</div>
10+
<div className="w-full flex">{children}</div>
1111
</nav>
1212
</header>
1313
)
@@ -59,27 +59,27 @@ export const Layout: FC<PropsWithChildren<LayoutProps>> = ({
5959
const isMobile = useIsMobile()
6060

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

6565
{isMobile && (
6666
<>
6767
{headerBreadcrumbsContent && (
6868
<HeaderBreadcrumbs hasSidebar={!!sidebar}>{headerBreadcrumbsContent}</HeaderBreadcrumbs>
6969
)}
70-
<main className="flex-1">{children}</main>
70+
<main className="flex-1 min-h-0">{children}</main>
7171
</>
7272
)}
7373

7474
{!isMobile && (
75-
<div className="flex-1 overflow-hidden">
75+
<div className="flex-1 overflow-hidden min-h-0">
7676
<div className="flex h-full">
7777
{sidebar && sidebar}
78-
<div className="flex flex-col flex-1">
78+
<div className="flex flex-col flex-1 min-h-0">
7979
{headerBreadcrumbsContent && (
8080
<HeaderBreadcrumbs hasSidebar={!!sidebar}>{headerBreadcrumbsContent}</HeaderBreadcrumbs>
8181
)}
82-
<main className="flex-1 overflow-y-auto">{children}</main>
82+
<main className="flex-1 overflow-y-auto min-h-0">{children}</main>
8383
</div>
8484
</div>
8585
</div>

0 commit comments

Comments
 (0)