Skip to content

style(web): PC 공지 배너 콘텐츠 영역 내부로 이동 #59

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
bbbang105 merged 1 commit into from
Mar 18, 2026
Merged

style(web): PC 공지 배너 콘텐츠 영역 내부로 이동 #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions packages/web/src/components/layout/main-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ function MainContent({
children,
showSidebar,
collapsed,
isAdmin,
}: {
children: React.ReactNode;
showSidebar: boolean;
collapsed: boolean;
isAdmin: boolean;
}) {
return (
<main
Expand All @@ -45,9 +47,12 @@ function MainContent({
>
<div
data-ptr-scroll="true"
className="w-full h-full overflow-y-auto px-4 sm:px-6 lg:px-8 py-6 max-w-7xl mx-auto"
className="w-full h-full overflow-y-auto"
>
{children}
{!isAdmin && <NoticeBanner />}
<div className="px-4 sm:px-6 lg:px-8 py-6 max-w-7xl mx-auto">
{children}
</div>
</div>
</main>
);
Expand Down Expand Up @@ -95,7 +100,6 @@ export function MainLayout({
본문으로 바로가기
</a>
<Header user={user} isAdmin={isAdmin} onLogout={handleLogout} />
{!isAdmin && <NoticeBanner />}
<PullToRefresh>
<div className="flex flex-1 min-h-0 overflow-hidden">
{showSidebar && (
Expand All @@ -105,7 +109,7 @@ export function MainLayout({
onToggleCollapsed={handleToggleCollapsed}
/>
)}
<MainContent showSidebar={showSidebar} collapsed={collapsed}>
<MainContent showSidebar={showSidebar} collapsed={collapsed} isAdmin={isAdmin}>
{children}
</MainContent>
</div>
Expand Down
Loading