Skip to content

Commit e76cdb2

Browse files
committed
Improve styling on Manage Tests
1 parent 103faf1 commit e76cdb2

File tree

7 files changed

+23
-14
lines changed

7 files changed

+23
-14
lines changed

src/app/components/elements/layout/SidebarLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ export const SetQuizzesSidebar = (props: SetQuizzesSidebarProps) => {
645645
return <ContentSidebar buttonTitle="Search & Filter">
646646
{above["lg"](deviceSize) && <div className="section-divider mt-5"/>}
647647
<h5>Search &amp; Filter</h5>
648-
<span className="quiz-filter-date-span">Title</span>
648+
<span className="quiz-filter-date-span mt-2">Title</span>
649649
<Input
650650
id="available-quizzes-title-filter" type="search"
651651
value={titleFilter} onChange={event => setTitleFilter(event.target.value)}
@@ -741,4 +741,4 @@ export const ManageQuizzesSidebar = (props: ManageQuizzesSidebarProps) => {
741741
{setDateFilterInput}
742742
{dueDateFilterInput}
743743
</ContentSidebar>;
744-
};
744+
};

src/app/components/pages/quizzes/SetQuizzes.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ function QuizAssignment({assignedGroups, index}: QuizAssignmentProps) {
216216

217217
</tr>
218218
{isExpanded && <tr>
219-
<td colSpan={4} className={classNames("bg-white border-0", {"px-2 pb-2": isPhy})}>
219+
<td colSpan={siteSpecific(5, 4)} className={classNames("bg-white border-0", {"px-2 pb-2": isPhy})}>
220220
<Table striped className="w-100 set-quiz-table-inner mb-1">
221221
<thead>
222222
<tr>
@@ -252,8 +252,8 @@ function QuizAssignment({assignedGroups, index}: QuizAssignmentProps) {
252252
</td>
253253
}
254254
<td className={isPhy ? "text-end" : "text-center"}>
255-
<Button tag={Link} size="sm" to={`/test/assignment/${assignedGroup.assignment.id}/feedback`} disabled={isCancelling} color="tertiary" className={`px-1 bg-transparent text-center ${below["md"](deviceSize) ? "btn-collapsed" : "btn-full"}`}>
256-
View {assignmentNotYetStarted ? siteSpecific("Details", "details") : siteSpecific("Results", "results")}
255+
<Button tag={Link} size="sm" to={`/test/assignment/${assignedGroup.assignment.id}/feedback`} disabled={isCancelling} color="tertiary" className={classNames(`px-2 text-center ${below["md"](deviceSize) ? "btn-collapsed" : "btn-full"}`, {"bg-transparent": isAda})}>
256+
View {assignmentNotYetStarted ? "details" : "results"}
257257
</Button>
258258
</td>
259259

src/scss/common/quiz.scss

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,10 @@
169169
content: "";
170170
background-image: url('/assets/common/icons/chevron_down.svg');
171171
background-repeat: no-repeat;
172-
background-position: center;
172+
background-position: left center;
173173
width: 20px;
174174
height: 10px;
175+
min-width: 1rem;
175176
margin-right: 1rem;
176177
margin-top: auto;
177178
margin-bottom: auto;
@@ -181,12 +182,8 @@
181182
}
182183
}
183184

184-
button {
185-
min-width: 150px !important;
186-
187-
&.btn-sm {
188-
min-width: 100px !important;
189-
}
185+
button.btn.btn {
186+
min-width: max-content;
190187
}
191188
}
192189

src/scss/cs/quiz.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,13 @@
2121
margin-top: -10px;
2222
}
2323
}
24+
25+
.set-quiz-table-dropdown {
26+
button {
27+
min-width: 150px !important;
28+
29+
&.btn-sm {
30+
min-width: 100px !important;
31+
}
32+
}
33+
}

src/scss/phy/button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
color: var(--buttons-light-text);
8383

8484
&:hover, &.btn-dropdown.active {
85-
background: var(--buttons-light-hover);
85+
background-color: var(--buttons-light-hover);
8686
color: var(--buttons-dark-text);
8787
text-decoration: none;
8888
}

src/scss/phy/color-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
--buttons-dark-prefix: #{$color-neutral-200};
7171
--buttons-keyline-border: #{$color-neutral-700};
7272
--buttons-keyline-white-hover: #{$color-brand-700};
73+
--buttons-light-hover: #{$color-brand-500};
7374
--buttons-light-hover-prefix: #{$color-neutral-200};
7475

7576
--nav-primary: #{$color-brand-500};

src/scss/phy/quiz.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
}
77

88
.set-quiz-table-inner {
9+
table-layout: auto;
910
background-color: white;
1011
color: black;
1112
border: 1px solid $color-neutral-200;
@@ -23,4 +24,4 @@
2324
font-size: 1.25rem;
2425
font-family: $secondary-font-medium;
2526
font-weight: bold;
26-
}
27+
}

0 commit comments

Comments
 (0)