Skip to content

♻️ Remove dedicated resources stylesheet and consolidate #2811

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

Draft
b-l-i-n-d wants to merge 4 commits into
base: 4.0.0-dev
Choose a base branch
from
Draft

♻️ Remove dedicated resources stylesheet and consolidate #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
124cf83
refactor(course-info): replace accordion with card layout for course …
b-l-i-n-d Jun 18, 2026
0c98da6
refactor(styles): remove dedicated resources stylesheet and consolidate
b-l-i-n-d Jun 18, 2026
34d1976
style(user): fix spacing in return type declaration
b-l-i-n-d Jun 19, 2026
12ebaf6
style: Add margin bottom to lesson content
b-l-i-n-d Jun 19, 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
11 changes: 9 additions & 2 deletions assets/src/scss/frontend/kids/_learning-area.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
border-bottom-right-radius: $tutor-radius-md;
}

.tutor-lesson-content .tutor-lesson-content-tab {
margin-bottom: $tutor-spacing-2;
}

.tutor-quiz-submission[data-question-layout-view='single_question'],
.tutor-quiz-submission[data-question-layout-view='question_pagination'] {
.tutor-quiz-question {
Expand All @@ -81,6 +85,10 @@
}
}

.tutor-learning-area-resources .tutor-resources-wrapper {
gap: $tutor-spacing-5;
}

.tutor-quiz-summary-page .tutor-quiz-review-dnd-rows {
gap: $tutor-spacing-4;
}
Expand Down Expand Up @@ -238,8 +246,7 @@
.tutor-meeting,
.tutor-quiz-intro,
.tutor-lesson-content .tutor-lesson-content-tab,
.tutor-quiz-summary .tutor-quiz-result,
.tutor-learning-area-resources .tutor-resources-wrapper {
.tutor-quiz-summary .tutor-quiz-result {
box-shadow: none;
}

Expand Down
79 changes: 15 additions & 64 deletions assets/src/scss/frontend/learning-area/pages/_course-info.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,78 +34,29 @@
margin-top: $tutor-spacing-8;
}

.tutor-course-accordion {
.tutor-course-info-cards {
@include tutor-flex(column);
gap: $tutor-spacing-2;
margin-top: $tutor-spacing-9;

&-item {
background-color: $tutor-surface-l1;
outline: 1px solid $tutor-border-idle;
border-radius: $tutor-radius-lg;
padding: $tutor-spacing-5 $tutor-spacing-6;

&:focus-within {
@include tutor-focus-ring();
}

.tutor-course-accordion-header {
@include tutor-flex(row, center, space-between);
cursor: pointer;
outline: none;

&-title {
@include tutor-typography(medium, medium);

@include tutor-breakpoint-down(sm) {
font-size: $tutor-font-size-small;
line-height: $tutor-font-size-small;
}
}

&-icon {
@include tutor-flex-center();

svg {
@include tutor-transition(transform);

@include tutor-breakpoint-down(sm) {
height: 20px;
width: 20px;
}
}
gap: $tutor-spacing-4;
}

&.is-expanded svg {
transform: rotate(180deg);
}
}
}
.tutor-course-info-list {
@include tutor-grid(2, $tutor-spacing-6);

.tutor-course-accordion-body {
@include tutor-typography(p3);
margin-top: $tutor-spacing-5;
}
@include tutor-breakpoint-down(sm) {
grid-template-columns: 1fr;
}

.tutor-course-accordion-list {
@include tutor-grid(2, $tutor-spacing-6);

@include tutor-breakpoint-down(sm) {
grid-template-columns: 1fr;
}

&-item {
@include tutor-flex(row);
gap: $tutor-spacing-4;
&-item {
@include tutor-flex(row);
gap: $tutor-spacing-4;

svg {
flex-shrink: 0;
}
svg {
flex-shrink: 0;
}
}

&-content {
@include tutor-typography(p3);
}
&-content {
@include tutor-typography(p3);
}
}

Expand Down
1 change: 0 additions & 1 deletion assets/src/scss/frontend/learning-area/pages/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
@forward './course-info';
@forward './qna';
@forward './quiz-intro';
@forward './resources';
@forward './announcements';
64 changes: 0 additions & 64 deletions assets/src/scss/frontend/learning-area/pages/_resources.scss
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion classes/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ public static function is_student_view(): bool {
*
* @return boolean
*/
public static function can_switch_mode( int $user_id = 0 ) : bool {
public static function can_switch_mode( int $user_id = 0 ): bool {
$user_id = tutor_utils()->get_user_id( $user_id );

return self::is_instructor( $user_id ) || self::is_admin( $user_id );
Expand Down
68 changes: 20 additions & 48 deletions templates/learning-area/subpages/course-info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,68 +221,40 @@
</div>
</div> -->

<?php if ( ! empty( get_the_content() ) || ! empty( $course_benefits ) ) : ?>
<div class="tutor-course-accordion">
<div class="tutor-course-info-cards">
<?php if ( ! empty( get_the_content() ) || ! empty( $course_benefits ) ) : ?>
<?php if ( ! empty( get_the_content() ) ) : ?>
<div x-data="{ expanded: false }" class="tutor-course-accordion-item">
<div
role="button"
tabindex="0"
@click="expanded = !expanded"
@keydown.enter.prevent="expanded = !expanded"
@keydown.space.prevent="expanded = !expanded"
:aria-expanded="expanded ? 'true' : 'false'"
class="tutor-course-accordion-header"
>
<div class="tutor-course-accordion-header-title">
<?php esc_html_e( 'About this Course', 'tutor' ); ?>
</div>
<div class="tutor-course-accordion-header-icon" :class="{ 'is-expanded': expanded }">
<?php SvgIcon::make()->name( Icon::CHEVRON_DOWN_2 )->size( 24 )->render(); ?>
</div>
<div class="tutor-card">
<div class="tutor-medium tutor-font-medium">
<?php esc_html_e( 'About this Course', 'tutor' ); ?>
</div>
<div x-show="expanded" x-collapse x-cloak class="tutor-course-accordion-body">
<div class="tutor-p3 tutor">
<?php the_content(); ?>
</div>
</div>
<?php endif; ?>

<?php if ( ! empty( $course_benefits ) && is_array( $course_benefits ) ) : ?>
<div x-data="{ expanded: false }" class="tutor-course-accordion-item">
<div
role="button"
tabindex="0"
@click="expanded = !expanded"
@keydown.enter.prevent="expanded = !expanded"
@keydown.space.prevent="expanded = !expanded"
:aria-expanded="expanded ? 'true' : 'false'"
class="tutor-course-accordion-header"
>
<div class="tutor-course-accordion-header-title">
<?php esc_html_e( "What you'll learn", 'tutor' ); ?>
</div>
<div class="tutor-course-accordion-header-icon" :class="{ 'is-expanded': expanded }">
<?php SvgIcon::make()->name( Icon::CHEVRON_DOWN_2 )->size( 24 )->render(); ?>
</div>
<div class="tutor-card">
<div class="tutor-medium tutor-font-medium">
<?php esc_html_e( "What you'll learn", 'tutor' ); ?>
</div>
<div x-show="expanded" x-collapse x-cloak class="tutor-course-accordion-body">
<div class="tutor-course-accordion-list">
<?php foreach ( $course_benefits as $benefit ) : ?>
<div class="tutor-course-accordion-list-item">
<?php SvgIcon::make()->name( Icon::CHECK_2 )->render(); ?>
<div class="tutor-course-accordion-list-content">
<?php echo esc_html( $benefit ); ?>
</div>
<div class="tutor-course-info-list tutor-mt-6">
<?php foreach ( $course_benefits as $benefit ) : ?>
<div class="tutor-course-info-list-item">
<?php SvgIcon::make()->name( Icon::CHECK_2 )->render(); ?>
<div class="tutor-course-info-list-content">
<?php echo esc_html( $benefit ); ?>
</div>
<?php endforeach; ?>
</div>
</div>
<?php endforeach; ?>
</div>
</div>
<?php endif; ?>
</div>
<?php endif; ?>
<?php endif; ?>
</div>

<div class="tutor-course-info-table tutor-table-wrapper tutor-table-bordered tutor-table-column-borders tutor-mt-6">
<div class="tutor-course-info-table tutor-table-wrapper tutor-table-bordered tutor-table-column-borders tutor-mt-4">
<table class="tutor-table tutor-surface-l1">
<?php foreach ( $metadata as $meta ) : ?>
<tr>
Expand Down
Loading