Skip to content

Commit 2a43c8b

Browse files
committed
Make Scoreboard great again
1 parent dd6fce8 commit 2a43c8b

3 files changed

Lines changed: 18 additions & 34 deletions

File tree

artifacts/game-client/src/apps/adepts-game/pages/FuneralRoundPage.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,15 @@ export default function FuneralRoundPage() {
190190
</aside>
191191
</div>
192192

193-
<div className="relative z-[110] grid shrink-0 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,15%)]">
194-
<div className="min-w-0" aria-hidden="true" />
195-
<div className="min-w-0">
196-
<Scoreboard
197-
players={state.players}
198-
onUpdateName={updatePlayerName}
199-
onUpdateScore={updatePlayerScore}
200-
onResetScores={resetScores}
201-
readonly={!isHost}
202-
currentTurnSeat={state.currentTurnSeat}
203-
/>
204-
</div>
205-
<div className="min-w-0" aria-hidden="true" />
193+
<div className="relative z-[110] w-full min-w-0 shrink-0">
194+
<Scoreboard
195+
players={state.players}
196+
onUpdateName={updatePlayerName}
197+
onUpdateScore={updatePlayerScore}
198+
onResetScores={resetScores}
199+
readonly={!isHost}
200+
currentTurnSeat={state.currentTurnSeat}
201+
/>
206202
</div>
207203

208204
<QuizBoardPandoraLottoOverlay />

artifacts/game-client/src/apps/adepts-game/pages/Home.tsx

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
153153
const threeColGridClass = showDonationsTable
154154
? "grid min-h-0 flex-1 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,15%)]"
155155
: "grid min-h-0 flex-1 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,0)]";
156-
const scoreboardGridClass = showDonationsTable
157-
? "grid shrink-0 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,15%)]"
158-
: "grid shrink-0 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,0)]";
159156

160157
return (
161158
<div className="adepts-quiz-theme h-screen flex flex-col text-foreground overflow-hidden">
@@ -229,23 +226,14 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
229226
</aside>
230227
</div>
231228

232-
<div className={scoreboardGridClass}>
233-
<div className="min-w-0" aria-hidden="true" />
234-
<div className="min-w-0">
235-
<Scoreboard
236-
players={state.players}
237-
onUpdateName={updatePlayerName}
238-
onUpdateScore={updatePlayerScore}
239-
onResetScores={resetScores}
240-
readonly={!isHost}
241-
currentTurnSeat={state.currentTurnSeat}
242-
/>
243-
</div>
244-
<div
245-
className={
246-
showDonationsTable ? "min-w-0" : "w-0 min-w-0 overflow-hidden p-0"
247-
}
248-
aria-hidden="true"
229+
<div className="w-full min-w-0 shrink-0">
230+
<Scoreboard
231+
players={state.players}
232+
onUpdateName={updatePlayerName}
233+
onUpdateScore={updatePlayerScore}
234+
onResetScores={resetScores}
235+
readonly={!isHost}
236+
currentTurnSeat={state.currentTurnSeat}
249237
/>
250238
</div>
251239

artifacts/game-client/src/lib/adepts-scoreboard/Scoreboard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export function Scoreboard({
260260
: undefined;
261261

262262
return (
263-
<div className="w-screen max-w-[100vw] shrink-0 border-t border-[hsla(275,55%,42%,0.35)] bg-gradient-to-t from-[hsla(278,42%,6%,1)] via-[hsla(274,42%,5%,0.97)] to-[hsla(270,42%,9%,0.92)] py-2 backdrop-blur-md md:py-2.5 ml-[calc(50%-50vw)]">
263+
<div className="w-full min-w-0 shrink-0 border-t border-[hsla(275,55%,42%,0.35)] bg-gradient-to-t from-[hsla(278,42%,6%,1)] via-[hsla(274,42%,5%,0.97)] to-[hsla(270,42%,9%,0.92)] py-2 backdrop-blur-md md:py-2.5">
264264
{!readonly && (
265265
<div className="mx-auto mb-2 flex w-full max-w-[1080px] justify-end px-2">
266266
<div className="flex items-center gap-2">

0 commit comments

Comments
 (0)