Skip to content

Commit 01d49d5

Browse files
committed
🎨 Fix column order and styles (#1304)
1 parent aac2d54 commit 01d49d5

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

src/lib/components/GradeLabel.svelte

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
</script>
1010

1111
<div class="rounded-lg border-2 border-white">
12-
<div class="p-1 w-10 text-center rounded-md {toWhiteTextIfNeeds(grade)} {gradeColor}">
12+
<div
13+
class="p-1 w-8 xs:w-10 text-sm xs:text-md text-center rounded-md {toWhiteTextIfNeeds(
14+
grade,
15+
)} {gradeColor}"
16+
>
1317
{#if taskGrade !== TaskGrade.PENDING}
1418
{grade}
1519
{:else}

src/lib/components/SubmissionStatus/SubmissionStatusImage.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
}
1818
</script>
1919

20-
<Img src={imagePath} alt={imageAlt} class="h-8 w-8" />
20+
<Img src={imagePath} alt={imageAlt} class="h-7 xs:h-8 w-7 xs:w-8" />
21+
2122
{#if isLoggedIn}
2223
<div class="flex flex-col items-center ml-2 md:ml-4 text-xs">
23-
<div class="mb-1 dark:text-gray-300">
24+
<div class="pb-1 dark:text-gray-300">
2425
{'更新'}
2526
</div>
2627
<ChevronDownOutline class="w-3 h-3 text-primary-600 dark:text-gray-300 inline" />

src/routes/workbooks/[slug]/+page.svelte

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,11 @@
141141
{#if workBookTasks.length}
142142
<div class="overflow-auto rounded-md border">
143143
<Table shadow class="text-md">
144-
<TableHead class="text-sm bg-gray-100">
145-
<TableHeadCell class="min-w-[96px] max-w-[120px]">回答</TableHeadCell>
146-
<TableHeadCell class="text-center px-0">グレード</TableHeadCell>
147-
<TableHeadCell class="min-w-[240px] max-w-2/3 truncate">問題名</TableHeadCell>
144+
<TableHead class="text-xs xs:text-sm bg-gray-100">
145+
<TableHeadCell class="text-center w-14 px-0.5 xs:px-0">グレード</TableHeadCell>
146+
<TableHeadCell class="text-center min-w-[96px] max-w-[120px]">回答</TableHeadCell>
147+
<TableHeadCell class="min-w-[240px] max-w-2/3 truncate px-0 sm:px-6">問題名</TableHeadCell
148+
>
148149
<TableHeadCell class="min-w-[120px] max-w-[150px] truncate">出典</TableHeadCell>
149150
<TableHeadCell class="text-center px-0">一言</TableHeadCell>
150151
</TableHead>
@@ -154,9 +155,16 @@
154155
key={getUniqueIdUsing(workBookTask.taskId)}
155156
class={getBackgroundColorFrom(getTaskResult(workBookTask.taskId).status_name)}
156157
>
158+
<!-- 問題のグレード -->
159+
<TableBodyCell class="justify-center w-14 px-3">
160+
<div class="flex items-center justify-center min-w-[54px] max-w-[54px]">
161+
<GradeLabel taskGrade={getTaskGrade(workBookTask.taskId)} />
162+
</div>
163+
</TableBodyCell>
164+
157165
<!-- 回答状況の更新 -->
158166
<TableBodyCell
159-
class="justify-center w-20 px-0.5 sm:px-3"
167+
class="justify-center w-20 px-0"
160168
on:click={() => handleClick(workBookTask.taskId)}
161169
>
162170
<div class="flex items-center justify-center min-w-[80px] max-w-[80px]">
@@ -167,15 +175,8 @@
167175
</div>
168176
</TableBodyCell>
169177

170-
<!-- 問題のグレード -->
171-
<TableBodyCell class="justify-center w-14 px-0">
172-
<div class="flex items-center justify-center min-w-[54px] max-w-[54px]">
173-
<GradeLabel taskGrade={getTaskGrade(workBookTask.taskId)} />
174-
</div>
175-
</TableBodyCell>
176-
177178
<!-- 問題のリンク -->
178-
<TableBodyCell>
179+
<TableBodyCell class="px-0 sm:px-6">
179180
<div class="xs:text-lg truncate">
180181
<ExternalLinkWrapper
181182
url={taskUrl(getContestIdFrom(workBookTask.taskId), workBookTask.taskId)}

0 commit comments

Comments
 (0)