Skip to content

Commit eab1f49

Browse files
authored
header, main, footerのCSSがちゃんと分けられるようになった。 (#577)
# PRの概要 ## 具体的な変更内容 ## 影響範囲 ## 動作要件 ## 補足 ## レビューリクエストを出す前にチェック! - [ ] 改めてセルフレビューしたか - [ ] 手動での動作検証を行ったか - [ ] server の機能追加ならば、テストを書いたか - 理由: 書いた | server の機能追加ではない - [ ] 間違った使い方が存在するならば、それのドキュメントをコメントで書いたか - 理由: 書いた | 間違った使い方は存在しない - [ ] わかりやすいPRになっているか <!-- レビューリクエスト後は、Slackでもメンションしてお願いすることを推奨します。 -->
1 parent e20dbe5 commit eab1f49

File tree

8 files changed

+10
-32
lines changed

8 files changed

+10
-32
lines changed

web/app/chat/layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ export default function ChatPageLayout({
1010
return (
1111
<NavigateByAuthState type="toLoginForUnauthenticated">
1212
<Header title="チャット/Chat" />
13-
<div className="absolute top-14 right-0 bottom-14 left-0 overflow-y-auto sm:top-16">
14-
{children}
15-
</div>
13+
<div className="grow overflow-y-auto">{children}</div>
1614
<BottomBar activeTab="3_chat" />
1715
</NavigateByAuthState>
1816
);

web/app/friends/layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ export default function FriendsPageLayout({
1010
return (
1111
<NavigateByAuthState type="toLoginForUnauthenticated">
1212
<Header title="フレンド/Friends" />
13-
<div className="absolute top-14 right-0 bottom-14 left-0 overflow-y-auto sm:top-16">
14-
{children}
15-
</div>
13+
<div className="grow overflow-y-auto">{children}</div>
1614
<BottomBar activeTab="1_friends" />
1715
</NavigateByAuthState>
1816
);

web/app/home/layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ export default function HomePageLayout({
1010
return (
1111
<NavigateByAuthState type="toLoginForUnauthenticated">
1212
<Header title="ホーム/Home" />
13-
<div className="relative top-14 right-0 bottom-14 left-0 overflow-y-auto sm:top-16">
14-
{children}
15-
</div>
13+
<div className="grow overflow-y-auto">{children}</div>
1614
<BottomBar activeTab="0_home" />
1715
</NavigateByAuthState>
1816
);

web/app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default function RootLayout({
5050
<AlertProvider>
5151
<ModalProvider>
5252
<BanLandscape />
53-
{children}
53+
<div className="flex h-screen flex-col">{children}</div>
5454
</ModalProvider>
5555
</AlertProvider>
5656
</AuthProvider>

web/app/search/layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ export default function HomePageLayout({
99
return (
1010
<>
1111
<Header title="検索/Search" />
12-
<div className="absolute top-14 right-0 bottom-14 left-0 overflow-y-auto sm:top-16">
13-
{children}
14-
</div>
12+
<div className="grow overflow-y-auto">{children}</div>
1513
<BottomBar activeTab="2_search" />
1614
</>
1715
);

web/app/settings/layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ export default function SettingsPageLayout({
99
return (
1010
<>
1111
<Header title="設定/Settings" />
12-
<div className="absolute top-14 right-0 bottom-14 left-0 overflow-y-auto sm:top-16">
13-
{children}
14-
</div>
12+
<div className="grow overflow-y-auto">{children}</div>
1513
<BottomBar activeTab="4_settings" />
1614
</>
1715
);

web/components/BottomBar.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,51 @@ type Props = {
1010
};
1111

1212
function BottomBarCell({
13-
label,
1413
href,
1514
iconComponent,
1615
isActive,
1716
}: {
18-
label: string;
1917
href: string;
2018
iconComponent: React.ReactNode;
2119
isActive: boolean;
2220
}) {
2321
return (
2422
<Link
2523
href={href}
26-
className={`focus:bg-gray-300 ${
24+
className={`flex flex-1 justify-center py-3 focus:bg-gray-300 ${
2725
isActive ? "active text-primary" : "text-secondary"
2826
}`}
2927
>
3028
{iconComponent}
31-
<span
32-
className={`text-xs ${isActive ? "text-primary" : "text-gray-500"}`}
33-
>
34-
{label}
35-
</span>
3629
</Link>
3730
);
3831
}
3932

4033
export default function BottomBar(props: Props) {
4134
const { activeTab } = props;
4235
return (
43-
<div className="btm-nav flex max-h-14 w-full flex-row">
36+
<div className="flex w-full flex-row items-center justify-around ">
4437
<BottomBarCell
45-
label="Home"
4638
href="/home"
4739
isActive={activeTab === "0_home"}
4840
iconComponent={<MdHome className="text-2xl" />}
4941
/>
5042
<BottomBarCell
51-
label="Friends"
5243
href="/friends"
5344
isActive={activeTab === "1_friends"}
5445
iconComponent={<MdPeople className="text-2xl" />}
5546
/>
5647
<BottomBarCell
57-
label="Search"
5848
href="/search"
5949
isActive={activeTab === "2_search"}
6050
iconComponent={<MdSearch className="text-2xl" />}
6151
/>
6252
<BottomBarCell
63-
label="Chat"
6453
href="/chat"
6554
isActive={activeTab === "3_chat"}
6655
iconComponent={<MdChat className="text-2xl" />}
6756
/>
6857
<BottomBarCell
69-
label="Settings"
7058
href="/settings"
7159
isActive={activeTab === "4_settings"}
7260
iconComponent={<MdSettings className="text-2xl" />}

web/components/Header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ type Props = {
99
export default function Header(props: Props) {
1010
const { title } = props;
1111
return (
12-
<header className="fixed top-0 left-0 z-50 w-full bg-secondary shadow-md">
13-
<div className="flex items-center justify-between px-4 py-2">
12+
<header className="w-full bg-secondary shadow-md">
13+
<div className="flex items-center justify-between px-4 py-3">
1414
<Link href="/home" passHref>
1515
<CourseMateIcon width="28px" height="28px" />
1616
</Link>

0 commit comments

Comments
 (0)