Skip to content

UI styles, DateFilter option, Table & templates fixes #2675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shewa12 merged 7 commits into from
May 8, 2026
Merged

UI styles, DateFilter option, Table & templates fixes #2675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b61426c
UI styles, DateFilter option, Table & templates fixes
sazedul-haque May 7, 2026
f0181ff
Add display utilities and use force classes
sazedul-haque May 8, 2026
098d19a
Simplify DateFilter and use ?? in Table
sazedul-haque May 8, 2026
100d8b0
background color changed
sazedul-haque May 8, 2026
6ebc6b8
button component used
sazedul-haque May 8, 2026
5ef200e
Icons updated
sazedul-haque May 8, 2026
e8150c9
Variant used instead of class
sazedul-haque May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions assets/core/scss/components/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
table {
min-width: 600px;
width: 100%;
border: none;
Copy link
Copy Markdown
Collaborator

@b-l-i-n-d b-l-i-n-d May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do check the other tables.

Copy link
Copy Markdown
Collaborator Author

@sazedul-haque sazedul-haque May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

td, th {
border: none;
}
}
}

Expand All @@ -28,6 +24,7 @@ table.tutor-table,
@include tutor-typography('small', 'regular', 'secondary');
width: 100%;
margin: 0px;
border: none;
border-collapse: collapse;
border-spacing: 0;
background-color: $tutor-surface-l1;
Expand All @@ -39,6 +36,8 @@ table.tutor-table,
@include tutor-typography(tiny, regular, secondary);
text-align: left;
padding: $tutor-spacing-5;
border: none;
white-space: nowrap;
border-bottom: 1px solid $tutor-border-idle;
}
}
Expand All @@ -56,7 +55,7 @@ table.tutor-table,
}

&:nth-child(odd) {
>td {
> td {
background-color: transparent;
}
}
Expand All @@ -66,12 +65,12 @@ table.tutor-table,
background-color: transparent;
padding: $tutor-spacing-5;
vertical-align: middle;
border: none;
}
}
}

.tutor-table-column-borders {

th,
td {
border-width: 0px 1px 0px 0px;
Expand All @@ -81,4 +80,4 @@ table.tutor-table,
border-width: 0px 0px 0px 0px;
}
}
}
}
6 changes: 6 additions & 0 deletions assets/core/scss/utilities/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ $grid-split-utils: (
// Display
@each $name, $value in $display-utils {
.tutor-#{$name} {
display: $value;
}
.tutor-force-#{$name} {
display: $value !important;
}
}
Expand Down Expand Up @@ -366,6 +369,9 @@ $overflow-types: auto, hidden, visible, scroll;
// Display utilities
@each $name, $value in $display-utils {
.tutor-#{$breakpoint}-#{$name} {
display: $value;
}
.tutor-force-#{$breakpoint}-#{$name} {
display: $value !important;
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/icons/ascending.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/icons/descending.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 7 additions & 45 deletions assets/src/js/v3/entries/course-builder/components/curriculum/QuestionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { useQuizModalContext } from '@CourseBuilderContexts/QuizModalContext';
import { type QuizForm } from '@CourseBuilderServices/quiz';
import { tutorConfig } from '@TutorShared/config/config';
import { Addons, CURRENT_VIEWPORT } from '@TutorShared/config/constants';
import { borderRadius, Breakpoint, colorTokens, shadow, spacing } from '@TutorShared/config/styles';
import { borderRadius, Breakpoint, colorTokens, spacing } from '@TutorShared/config/styles';
import { typography } from '@TutorShared/config/typography';
import For from '@TutorShared/controls/For';
import Show from '@TutorShared/controls/Show';
Expand Down Expand Up @@ -475,12 +475,14 @@ const QuestionList = ({ isEditing }: { isEditing: boolean }) => {
<Show when={contentType !== 'tutor_h5p_quiz'}>
<GenerateQuizWithAi />
</Show>
<button
<Button
type="button"
size="small"
data-cy="add-question"
data-add-question-button
ref={addButtonRef}
type="button"
aria-label={__('Add question', 'tutor')}
isIconOnly
icon={<SVGIcon name="plus" width={20} height={20} />}
onClick={() => {
if (contentType === 'tutor_h5p_quiz') {
showModal({
Expand All @@ -498,9 +500,7 @@ const QuestionList = ({ isEditing }: { isEditing: boolean }) => {
setIsOpen(true);
}
}}
>
<SVGIcon name="plusSquareBrand" width={32} height={32} />
</button>
/>
</div>
</div>

Expand Down Expand Up @@ -746,46 +746,8 @@ const styles = {
align-items: center;
gap: ${spacing[4]};

[data-add-question-button],
[data-generate-quiz-button] {
${styleUtils.resetButton};
width: 32px;
height: 32px;
border-radius: ${borderRadius[6]};
display: inline-flex;
align-items: center;
justify-content: center;

&:focus,
&:active,
&:hover {
background: none;
}

svg {
color: ${colorTokens.action.primary.default};
width: 100%;
height: 100%;
}

&:focus {
box-shadow: ${shadow.focus};
}

:focus-visible {
box-shadow: none;
outline: 2px solid ${colorTokens.stroke.brand};
outline-offset: 1px;
}
}

[data-generate-quiz-button] {
border: 1px solid ${colorTokens.stroke.divider};

svg {
width: 24px;
height: 24px;
}
}
`,
questionList: css`
Expand Down
98 changes: 49 additions & 49 deletions assets/src/scss/frontend/components/_upcoming-lesson-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,38 @@
@use '@Core/scss/mixins' as *;

.tutor-upcoming-lesson-card {
background-color: $tutor-surface-l1;
padding: $tutor-spacing-6;
border: 1px solid $tutor-border-idle;
border-radius: $tutor-radius-2xl;

&:hover {
background-color: $tutor-surface-l1-hover;
@include tutor-breakpoint-up(sm) {
.tutor-upcoming-lesson-card-live-tag-badge {
opacity: 0;
visibility: hidden;
}
.tutor-upcoming-lesson-card-action {
opacity: 1;
visibility: visible;
pointer-events: auto;
}
}
@include tutor-breakpoint-up(sm) {
.tutor-upcoming-lesson-card-live-tag-badge {
opacity: 0;
visibility: hidden;
}
.tutor-upcoming-lesson-card-action {
opacity: 1;
visibility: visible;
pointer-events: auto;
}
}
}

&:focus-within {
@include tutor-breakpoint-up(sm) {
.tutor-upcoming-lesson-card-live-tag-badge {
opacity: 0;
visibility: hidden;
}
.tutor-upcoming-lesson-card-action {
opacity: 1;
visibility: visible;
pointer-events: auto;
}
}
@include tutor-breakpoint-up(sm) {
.tutor-upcoming-lesson-card-live-tag-badge {
opacity: 0;
visibility: hidden;
}
.tutor-upcoming-lesson-card-action {
opacity: 1;
visibility: visible;
pointer-events: auto;
}
}
}

&-header {
Expand All @@ -54,42 +55,41 @@
@include tutor-flex-center;
}

&-live-tag {
position: relative;

&-live-tag {
position: relative;

&-badge {
@include tutor-flex(row, center, center);
opacity: 1;
visibility: visible;
z-index: $tutor-z-positive;
@include tutor-transition((opacity, visibility));
}
}
&-badge {
@include tutor-flex(row, center, center);
opacity: 1;
visibility: visible;
z-index: $tutor-z-positive;
@include tutor-transition((opacity, visibility));
}
}

&-action {
@include tutor-flex(row, center, center);
position: absolute;
top: 0;
right: 0;
opacity: 0;
visibility: hidden;
pointer-events: none;
z-index: $tutor-z-dropdown;
@include tutor-transition((opacity, visibility));
&-action {
@include tutor-flex(row, center, center);
position: absolute;
top: 0;
right: 0;
opacity: 0;
visibility: hidden;
pointer-events: none;
z-index: $tutor-z-dropdown;
@include tutor-transition((opacity, visibility));

&:hover {
color: $tutor-text-primary-inverse;
}
}
&:hover {
color: $tutor-text-primary-inverse;
}
}

&-title {
@include tutor-typography('small', 'medium', 'primary', 'body');
margin: 0 0 $tutor-spacing-5 0;

@include tutor-breakpoint-down(sm) {
color: $tutor-text-brand;
}
color: $tutor-text-brand;
}
}

&-course {
Expand Down
21 changes: 2 additions & 19 deletions assets/src/scss/frontend/dashboard/_profile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,10 @@
@use '@Core/scss/tokens' as *;

.tutor-user-profile {
.tutor-profile-header {
@include tutor-breakpoint-down(sm) {
display: none;
}
}

.tutor-profile-page-title {
@include tutor-typography(h4, semibold, primary, heading);

@include tutor-breakpoint-up(sm) {
display: none;
}
}

.tutor-profile-card {
@include tutor-card-base;
border-radius: $tutor-radius-2xl;
padding: $tutor-spacing-6;
margin-top: $tutor-spacing-9;

@include tutor-breakpoint-down(sm) {
margin-top: $tutor-spacing-6;
}
}

.tutor-profile-card-header {
Expand Down Expand Up @@ -73,6 +54,7 @@

.tutor-user-profile-title {
@include tutor-typography(h3, semibold, primary, heading);
margin-top: $tutor-spacing-none;
margin-bottom: $tutor-spacing-2;

@include tutor-breakpoint-down(sm) {
Expand Down Expand Up @@ -160,6 +142,7 @@

.tutor-statistic-title {
@include tutor-typography(h5, semibold, primary, heading);
margin-top: $tutor-spacing-none;
margin-bottom: $tutor-spacing-4;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/src/scss/frontend/dashboard/layout/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
top: 0;
height: 80px;
z-index: $tutor-z-header;
background-color: $tutor-surface-sidebar-l1;
background-color: $tutor-surface-base;
border-bottom: 1px solid $tutor-border-idle;
padding: $tutor-spacing-6 $tutor-spacing-8;

Expand Down
2 changes: 1 addition & 1 deletion assets/src/scss/frontend/learning-area/_quiz.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ $tutor-quiz-content-bottom-offset: calc(
box-shadow: none;

button {
display: flex;
display: flex !important;
}

&:hover {
Expand Down
Loading
Loading