From 0880df6dca9594a3d084a0fb9fa8d8df8c286ffb Mon Sep 17 00:00:00 2001 From: b-l-i-n-d Date: Mon, 11 May 2026 17:59:28 +0600 Subject: [PATCH 01/18] feat: Show content title on small screen device --- templates/learning-area/components/header.php | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/templates/learning-area/components/header.php b/templates/learning-area/components/header.php index fa98dacbd1..95fda896bc 100644 --- a/templates/learning-area/components/header.php +++ b/templates/learning-area/components/header.php @@ -20,12 +20,17 @@ global $tutor_course_id, $tutor_course, $current_user_id, +$tutor_current_post, $tutor_course_progress, $tutor_can_complete_course, $tutor_can_retake_course, $course_complete_modal_id, $course_retake_modal_id; + +$course_title = $tutor_course->post_title; +$content_title = $tutor_current_post->post_title ?? ''; ?> +
@@ -33,18 +38,22 @@ name( Icon::LEFT )->size( 20 )->render(); ?>
- post_title ); ?> + + + + + +
- + + + + + + +
- diff --git a/templates/learning-area/components/sidebar.php b/templates/learning-area/components/sidebar.php index 7cb2064a76..68f1c5d69b 100644 --- a/templates/learning-area/components/sidebar.php +++ b/templates/learning-area/components/sidebar.php @@ -54,14 +54,16 @@
post_title ); ?>
-
From 2041f296910154b6ca4c15b9e03b63959d57efa0 Mon Sep 17 00:00:00 2001 From: b-l-i-n-d Date: Mon, 11 May 2026 20:59:33 +0600 Subject: [PATCH 05/18] fix(learning-area): improve responsive content layouts --- assets/src/scss/frontend/kids/_learning-area.scss | 11 +++++++++-- .../scss/frontend/learning-area/layout/_footer.scss | 5 +++++ templates/learning-area/subpages/announcements.php | 6 +++--- templates/learning-area/subpages/course-info.php | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/assets/src/scss/frontend/kids/_learning-area.scss b/assets/src/scss/frontend/kids/_learning-area.scss index a907678029..7f766b8863 100644 --- a/assets/src/scss/frontend/kids/_learning-area.scss +++ b/assets/src/scss/frontend/kids/_learning-area.scss @@ -227,10 +227,15 @@ padding: 0; } + .tutor-webinar-card { + overflow: hidden; + } + .tutor-meeting, .tutor-quiz-intro, .tutor-lesson-content .tutor-lesson-content-tab, - .tutor-quiz-summary .tutor-quiz-result { + .tutor-quiz-summary .tutor-quiz-result, + .tutor-learning-area-resources .tutor-resources-wrapper { box-shadow: none; } @@ -245,7 +250,9 @@ .tutor-quiz-summary .tutor-quiz-summary-overview, .tutor-quiz-intro-params, .tutor-lesson-content .tutor-lesson-content-tab .tutor-tabs-nav, - .tutor-lesson-content .tutor-lesson-content-tab .tutor-tabs-content { + .tutor-lesson-content .tutor-lesson-content-tab .tutor-tabs-content, + .tutor-learning-area-resources .tutor-tabs-nav, + .tutor-learning-area-resources .tutor-tabs-content { @include tutor-kids-shadow(false, $tutor-border-idle, $tutor-radius-6xl, sm); } diff --git a/assets/src/scss/frontend/learning-area/layout/_footer.scss b/assets/src/scss/frontend/learning-area/layout/_footer.scss index 1eeb76438f..ff3877146c 100644 --- a/assets/src/scss/frontend/learning-area/layout/_footer.scss +++ b/assets/src/scss/frontend/learning-area/layout/_footer.scss @@ -25,6 +25,11 @@ &:only-child { width: 100%; } + + .tutor-mark-as-complete-button { + @include tutor-button-size(large); + width: 100%; + } } button:not(.tutor-mark-as-complete-button), diff --git a/templates/learning-area/subpages/announcements.php b/templates/learning-area/subpages/announcements.php index eb54a3e51c..ddd0b4bef1 100644 --- a/templates/learning-area/subpages/announcements.php +++ b/templates/learning-area/subpages/announcements.php @@ -57,7 +57,7 @@
post_content ); ?>
-
+
post_author; @@ -66,10 +66,10 @@ user( $author_id )->size( Size::SIZE_24 )->render(); ?>
- +
-
+
name( Icon::ANNOUNCEMENT )->render(); ?> post_date ) ); ?>
diff --git a/templates/learning-area/subpages/course-info.php b/templates/learning-area/subpages/course-info.php index f230228f10..4730255f63 100644 --- a/templates/learning-area/subpages/course-info.php +++ b/templates/learning-area/subpages/course-info.php @@ -131,7 +131,7 @@ ob_start(); if ( ! empty( $course_tags ) && is_array( $course_tags ) ) { ?> -
+
$tags ) { Badge::make() From 68e82c9172db343985a3b800793df9034a658561 Mon Sep 17 00:00:00 2001 From: b-l-i-n-d Date: Mon, 11 May 2026 21:17:03 +0600 Subject: [PATCH 06/18] fix(settings): update mobile close behavior --- templates/dashboard/account/settings.php | 59 ++++++++++++++++--- .../dashboard/account/settings/header.php | 6 +- 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/templates/dashboard/account/settings.php b/templates/dashboard/account/settings.php index 4c2c7c2b37..6f156ed74b 100644 --- a/templates/dashboard/account/settings.php +++ b/templates/dashboard/account/settings.php @@ -13,6 +13,7 @@ use TUTOR\Icon; use TUTOR\User; +use Tutor\Helpers\UrlHelper; $settings_tab_data = array( 'account' => array( @@ -68,19 +69,59 @@ function ( $tab ) { } ) ); + +$back_url = apply_filters( 'tutor_dashboard_back_url', UrlHelper::back( tutor_utils()->tutor_dashboard_url() ) ); ?>
diff --git a/templates/dashboard/account/settings/header.php b/templates/dashboard/account/settings/header.php index c1d1425783..78e9a633ba 100644 --- a/templates/dashboard/account/settings/header.php +++ b/templates/dashboard/account/settings/header.php @@ -89,18 +89,16 @@ class="tutor-profile-header-close tutor-md-hidden" Button::make() ->label( __( 'Close', 'tutor' ) ) ->variant( Variant::GHOST ) - ->tag( 'a' ) ->icon( Icon::CROSS, 'left', 20, 20 ) ->icon_only() ->size( Size::X_SMALL ) ->attr( 'type', 'button' ) - ->attr( 'href', esc_url( $back_url ) ) + ->attr( '@click', 'handleMobileClose()' ) ->render(); ?>
icon_only() ->size( Size::X_SMALL ) ->attr( 'type', 'button' ) - ->attr( '@click', 'activeTab = "none"' ) + ->attr( '@click', 'handleClose()' ) ->render(); ?>
From 0a4d8fde008a92c9ae0a21b069b7d26379fd60cb Mon Sep 17 00:00:00 2001 From: b-l-i-n-d Date: Mon, 11 May 2026 21:23:51 +0600 Subject: [PATCH 07/18] chore: Use printf instead of echo sprintf --- templates/learning-area/components/sidebar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/learning-area/components/sidebar.php b/templates/learning-area/components/sidebar.php index 68f1c5d69b..01fa48f587 100644 --- a/templates/learning-area/components/sidebar.php +++ b/templates/learning-area/components/sidebar.php @@ -73,7 +73,7 @@ class="tutor-learning-sidebar"
' . esc_html( $tutor_course_progress ) . '%' ); + printf( esc_html__( '%s Completed', 'tutor' ), '' . esc_html( $tutor_course_progress ) . '%' ); ?>
From 875ada60e310f8c511b654447e1b5d645f7b5ee4 Mon Sep 17 00:00:00 2001 From: b-l-i-n-d Date: Mon, 11 May 2026 23:13:41 +0600 Subject: [PATCH 08/18] style: Fix mobile top for header --- assets/src/scss/frontend/dashboard/layout/_account.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/src/scss/frontend/dashboard/layout/_account.scss b/assets/src/scss/frontend/dashboard/layout/_account.scss index c83eb53150..09453eb7f3 100644 --- a/assets/src/scss/frontend/dashboard/layout/_account.scss +++ b/assets/src/scss/frontend/dashboard/layout/_account.scss @@ -14,6 +14,12 @@ top: 32px; } + @include tutor-breakpoint-down(sm) { + body:has(#wpadminbar) & { + top: 0; + } + } + &-title { @include tutor-typography(h4, semibold, primary, heading); From 0f27d05d98c26f371a5bc083228079b657c8fa59 Mon Sep 17 00:00:00 2001 From: b-l-i-n-d Date: Tue, 12 May 2026 00:45:26 +0600 Subject: [PATCH 09/18] style: Add billing mobile responsive and kids design --- assets/icons/kids/history.svg | 1 + .../src/scss/frontend/dashboard/_billing.scss | 67 +++++++++++-------- .../dashboard/_subscription-history.scss | 1 - assets/src/scss/frontend/kids/_dashboard.scss | 29 ++++++-- templates/dashboard/account/billing.php | 6 +- .../account/billing/order-history.php | 2 +- 6 files changed, 67 insertions(+), 39 deletions(-) create mode 100644 assets/icons/kids/history.svg diff --git a/assets/icons/kids/history.svg b/assets/icons/kids/history.svg new file mode 100644 index 0000000000..3657b739d4 --- /dev/null +++ b/assets/icons/kids/history.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/src/scss/frontend/dashboard/_billing.scss b/assets/src/scss/frontend/dashboard/_billing.scss index c1f6a0d687..9640f0c86a 100644 --- a/assets/src/scss/frontend/dashboard/_billing.scss +++ b/assets/src/scss/frontend/dashboard/_billing.scss @@ -2,25 +2,9 @@ @use '@Core/scss/mixins' as *; .tutor-billing { - &-header { - background-color: $tutor-surface-base; - border-bottom: 1px solid $tutor-border-idle; - padding-block: $tutor-spacing-5; - - @include tutor-breakpoint-down(sm) { - border-bottom: none; - } - } - &-body { @include tutor-card-base; @include tutor-card-radius(lg); - @include tutor-flex(column, flex-start, center); - margin-top: $tutor-spacing-9; - - .tutor-tabs-horizontal { - width: 100%; - } @include tutor-breakpoint-down(sm) { background-color: transparent; @@ -31,10 +15,23 @@ } &-tabs { - padding: $tutor-spacing-6; + padding: $tutor-spacing-5 $tutor-spacing-6; + border-bottom: 1px solid $tutor-border-idle; + width: 100%; + + @include tutor-breakpoint-down(sm) { + margin-bottom: $tutor-spacing-4; + } &-content { width: 100%; + + @include tutor-breakpoint-down(sm) { + border: 1px solid $tutor-border-idle; + background-color: $tutor-surface-l1; + border-radius: $tutor-radius-2xl; + margin-top: $tutor-spacing-4; + } } @include tutor-breakpoint-down(sm) { @@ -56,7 +53,6 @@ width: 100%; @include tutor-breakpoint-down(sm) { - margin-top: $tutor-spacing-4; border: 1px solid $tutor-border-idle; background-color: $tutor-surface-l1; border-radius: $tutor-radius-2xl; @@ -98,7 +94,9 @@ &-left { @include tutor-flex(column, flex-start, center); + flex: 1 1 0; gap: $tutor-spacing-3; + min-width: 0; .tutor-section-separator-vertical { background-color: $tutor-surface-l2-hover; @@ -108,13 +106,17 @@ &-right { @include tutor-flex(column, flex-end, center); + flex-shrink: 0; gap: $tutor-spacing-2; - text-align: right + text-align: right; } &-title { + @include tutor-flex(row, start, flex-start); @include tutor-typography('small', 'medium'); - @include tutor-flex(row, start, center); + @include tutor-text-truncate(); + min-width: 0; + width: 100%; gap: $tutor-spacing-2; ul { @@ -133,6 +135,11 @@ @include tutor-breakpoint-down(sm) { @include tutor-flex(column, flex-start, center); + overflow: visible; + text-overflow: unset; + white-space: normal; + overflow-wrap: anywhere; + word-break: break-word; } } @@ -152,15 +159,17 @@ } &-payment-method { - @extend .tutor-billing-card-id; - @include tutor-typography('tiny-2'); - gap: $tutor-spacing-2; - border-radius: $tutor-radius-sm; - color: $tutor-text-secondary; - @include tutor-breakpoint-down(sm) { - @include tutor-typography('tiny'); - padding: $tutor-spacing-2; + .tutor-badge { + font-size: 0; + line-height: 0; + gap: 0; + padding: $tutor-spacing-2; + + img { + display: block; + } + } } } @@ -200,4 +209,4 @@ } } } -} \ No newline at end of file +} diff --git a/assets/src/scss/frontend/dashboard/_subscription-history.scss b/assets/src/scss/frontend/dashboard/_subscription-history.scss index 14e39300b6..07d6eef4d7 100644 --- a/assets/src/scss/frontend/dashboard/_subscription-history.scss +++ b/assets/src/scss/frontend/dashboard/_subscription-history.scss @@ -26,7 +26,6 @@ } .tutor-subscription { - &-history { .tutor-billing-card { &:hover { diff --git a/assets/src/scss/frontend/kids/_dashboard.scss b/assets/src/scss/frontend/kids/_dashboard.scss index c401271999..b4381109e1 100644 --- a/assets/src/scss/frontend/kids/_dashboard.scss +++ b/assets/src/scss/frontend/kids/_dashboard.scss @@ -21,11 +21,26 @@ .tutor-review-card, .tutor-dashboard-home-chart, .tutor-dashboard-home-card, - .tutor-dashboard-home-sort .tutor-popover-bottom { + .tutor-dashboard-home-sort .tutor-popover-bottom, + .tutor-subscription-payments-item:hover { + @include tutor-kids-shadow; + } + + .tutor-billing-card:hover { @include tutor-kids-shadow; + &:not(:last-of-type) { + border-bottom: 1px solid transparent; + } } - .tutor-progress-card .tutor-progress-card-thumbnail { + .tutor-billing-body { + @include tutor-kids-shadow(false, $tutor-border-idle, $tutor-radius-6xl, sm); + } + + .tutor-progress-card .tutor-progress-card-thumbnail, + .tutor-subscription-overview-card, + .tutor-subscription-payments-list, + .tutor-subscription-details-alert { border-radius: $tutor-radius-3xl; } @@ -220,12 +235,14 @@ gap: $tutor-spacing-5; } - .tutor-dashboard-page-card { + .tutor-dashboard-page-card, + .tutor-billing-body { border-radius: 0px; box-shadow: none; } - .tutor-dashboard-page-card-header { + .tutor-dashboard-page-card-header, + .tutor-billing-tabs { margin-bottom: $tutor-spacing-5; } @@ -234,7 +251,9 @@ @include tutor-kids-shadow(false); } - .tutor-dashboard-page-card-body { + .tutor-dashboard-page-card-body, + .tutor-billing-tabs, + .tutor-billing-tabs-content { @include tutor-kids-shadow(false, $tutor-border-idle, $tutor-radius-6xl); } diff --git a/templates/dashboard/account/billing.php b/templates/dashboard/account/billing.php index c0f4849646..8c6d3c54ca 100644 --- a/templates/dashboard/account/billing.php +++ b/templates/dashboard/account/billing.php @@ -48,13 +48,13 @@