bug: Page Transition Effect fix
This commit is contained in:
parent
b1efd5c345
commit
ce2cfec9f3
@ -34,17 +34,10 @@ export default function PageLayout({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
{/* Main content now participates in normal document flow */}
|
{/* Main content now participates in normal document flow */}
|
||||||
<div className="flex-1 relative z-10 w-full flex flex-col">
|
<div className="flex-1 relative z-10 w-full flex flex-col">
|
||||||
<PageTransitionEffect>{children}</PageTransitionEffect>
|
<PageTransitionEffect>{children}</PageTransitionEffect>
|
||||||
</div>
|
</div>
|
||||||
=======
|
|
||||||
{/* Main content grows to fill available space */}
|
|
||||||
<main className="flex-1 relative z-10 w-full overflow-y-auto">
|
|
||||||
{children}
|
|
||||||
</main>
|
|
||||||
>>>>>>> 6ebe4eed3d7f8ef6bedea5dcf742bc73462a8af8
|
|
||||||
|
|
||||||
{showFooter && (
|
{showFooter && (
|
||||||
<div className="relative z-50 flex-shrink-0">
|
<div className="relative z-50 flex-shrink-0">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user