Skip to content

Commit 5afe0fc

Browse files
authored
QA: 수정된 레이아웃 반영 (#190)
* refactor: 수정된 레이아웃 반영 * refactor: 전역 레이아웃 스타일 하나로 통일
1 parent d42237f commit 5afe0fc

6 files changed

Lines changed: 27 additions & 28 deletions

File tree

app/(main)/layout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { mainLayout } from "@/shared/styles/base/global.css";
1+
import { maxWidth } from "@/shared/styles/base/global.css";
22
import NavbarMain from "@/shared/ui/navbar/navbar-main";
33
import type { ReactNode } from "react";
44

55
const MainLayout = ({ children }: { children: ReactNode }) => {
66
return (
7-
<div className={mainLayout}>
7+
<div className={maxWidth}>
88
<NavbarMain />
99
{children}
1010
</div>

app/(sub)/capsule-detail/[invite-code]/[id]/page.css.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ export const container = style({
55
display: "flex",
66
flexDirection: "column",
77
gap: "1.6rem",
8-
margin: "0 1.6rem",
8+
margin: "0 auto",
9+
maxWidth: "90rem",
10+
padding: "0 1.6rem",
911
});
1012

1113
export const textHighlight = style({

app/(sub)/capsule-detail/[invite-code]/[id]/page.tsx

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,24 +121,25 @@ const CapsuleDetailPage = () => {
121121
);
122122
}}
123123
/>
124-
<RevealMotion>
125-
<InfoTitle
126-
title={result.title}
127-
participantCount={result.participantCount}
128-
joinLettersCount={result.letterCount}
129-
/>
130-
</RevealMotion>
131-
<CapsuleImage imageUrl={result.beadVideoUrl} />
132-
<div className={styles.container}>
133-
<RevealMotion delay={0.8}>
134-
{result.subtitle && <CaptionSection description={result.subtitle} />}
124+
125+
<RevealMotion>
126+
<InfoTitle
127+
title={result.title}
128+
participantCount={result.participantCount}
129+
joinLettersCount={result.letterCount}
130+
/>
135131
</RevealMotion>
136-
<RevealMotion delay={1.2}>
137-
<OpenInfoSection openAt={formatDateTime(result.openAt)} />
138-
</RevealMotion>
139-
</div>
140-
<ResponsiveFooter capsuleData={data} isLoggedIn={isLoggedIn} />
141-
{result.status !== "WRITABLE" && <InfoToast status={result.status} />}
132+
<CapsuleImage imageUrl={result.beadVideoUrl} />
133+
<div className={styles.container}>
134+
<RevealMotion delay={0.8}>
135+
{result.subtitle && <CaptionSection description={result.subtitle} />}
136+
</RevealMotion>
137+
<RevealMotion delay={1.2}>
138+
<OpenInfoSection openAt={formatDateTime(result.openAt)} />
139+
</RevealMotion>
140+
</div>
141+
<ResponsiveFooter capsuleData={data} isLoggedIn={isLoggedIn} />
142+
{result.status !== "WRITABLE" && <InfoToast status={result.status} />}
142143
</>
143144
);
144145
};

app/(sub)/capsule-detail/_components/responsive-footer/responsive-footer.css.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ export const container = style({
1111
...screen.md({
1212
position: "fixed",
1313
bottom: "7rem",
14-
width: "calc(80rem - 3.4rem)",
14+
left: "50%",
15+
transform: "translateX(-50%)",
16+
width: "calc(90rem - 3.4rem)",
1517
flexDirection: "row",
16-
margin: "0 1.7rem",
1718
padding: "1.2rem 1.2rem 1.2rem 2.4rem",
1819
background: themeVars.color.gradient.darkgray_op,
1920
}),

shared/styles/base/global.css.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ export const globalLayout = style({
4848
});
4949

5050
export const maxWidth = style({
51-
maxWidth: "800px",
52-
width: "100%",
53-
});
54-
55-
export const mainLayout = style({
5651
maxWidth: "1200px",
5752
width: "100%",
5853
});

shared/ui/navbar/navbar-detail/navbar-detail.css.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const container = style({
1212
left: "50%",
1313
transform: "translateX(-50%)",
1414
width: "100%",
15-
maxWidth: "80rem",
15+
maxWidth: "120rem",
1616
});
1717

1818
export const iconButton = style({

0 commit comments

Comments
 (0)