Skip to content

Commit 01f9344

Browse files
authored
Merge pull request #192 from CS3219-AY2425S1/fix/bug/collab-service-entire-page-scroll-down
Fix: Entire collab page scroll down bug
2 parents cc7144e + 24cb0a4 commit 01f9344

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

frontend/components/collab/chat.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export default function Chat({ roomId }: { roomId: string }) {
202202
}
203203

204204
return (
205-
<Card className="flex flex-col">
205+
<Card className="flex flex-col h-full">
206206
<CardHeader>
207207
<CardTitle className="flex justify-between items-center">
208208
Chat

frontend/components/collab/collab-room.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Link from "next/link";
88

99
export default function CollabRoom({ roomId }: { roomId: string }) {
1010
return (
11-
<div className="h-full flex flex-col mx-4 p-4">
11+
<div className="h-screen flex flex-col mx-4 p-4 overflow-hidden">
1212
<header className="flex justify-between border-b">
1313
<h1 className="text-2xl font-bold mb-4">Collab Room {roomId}</h1>
1414
<Link href="/app/history">
@@ -18,10 +18,12 @@ export default function CollabRoom({ roomId }: { roomId: string }) {
1818
</Button>
1919
</Link>
2020
</header>
21-
<div className="flex flex-1">
22-
<div className="w-2/5 p-4 flex flex-col space-y-4">
21+
<div className="flex flex-1 overflow-hidden">
22+
<div className="w-2/5 p-4 flex flex-col space-y-4 overflow-hidden">
2323
<QuestionDisplay roomId={roomId} />
24-
<Chat roomId={roomId} />
24+
<div className="flex-1 overflow-hidden">
25+
<Chat roomId={roomId} />
26+
</div>
2527
</div>
2628
<CodeEditor roomId={roomId} />
2729
</div>

0 commit comments

Comments
 (0)