Skip to content

Commit 33a8735

Browse files
committed
Merge branch '4.0.0-dev' of https://github.com/themeum/tutor into bivas-v4
2 parents 7016133 + ba1c20a commit 33a8735

12 files changed

Lines changed: 26 additions & 103 deletions

File tree

assets/core/scss/components/_attachment-card.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@use '../tokens' as *;
22
@use '../mixins' as *;
3+
@use '../utilities' as *;
34

45
.tutor-attachment-card {
56
@include tutor-flex(row, center, flex-start);
@@ -42,7 +43,7 @@
4243

4344
&-title {
4445
@include tutor-typography('small', 'medium', 'primary');
45-
@include tutor-text-truncate;
46+
@include tutor-text-clamp(1);
4647
}
4748

4849
&-meta {

assets/core/scss/components/_nav.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,19 @@
2626
color: $tutor-text-brand;
2727
background-color: $tutor-tab-l3-active;
2828
box-shadow: $tutor-tab-active-shadow;
29+
svg {
30+
color: $tutor-icon-brand;
31+
}
2932
}
3033

3134
&:focus {
3235
color: $tutor-text-brand;
3336
background-color: $tutor-tab-l3-active;
3437
box-shadow: none;
3538
outline: none;
39+
svg {
40+
color: $tutor-icon-brand;
41+
}
3642
}
3743

3844
&:focus-visible {
@@ -44,6 +50,9 @@
4450
background-color: $tutor-tab-l3-active;
4551
color: $tutor-text-brand;
4652
box-shadow: $tutor-tab-active-shadow;
53+
svg {
54+
color: $tutor-icon-brand;
55+
}
4756
}
4857

4958
svg {

assets/core/scss/mixins/_buttons.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
background-color: $tutor-button-primary-disabled;
8383
color: $tutor-text-primary-inverse;
8484
--tutor-button-border-shadow: #{$tutor-button-primary-border-shadow-disabled};
85+
svg:not([class]) {
86+
color: $tutor-text-primary-inverse;
87+
}
8588
}
8689
} @else if $variant == primary-soft {
8790
background-color: $tutor-button-primary-soft;

assets/core/scss/mixins/_utilities.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
}
8181

8282
@mixin tutor-transition($properties: all, $duration: 0.25s, $timing: ease-in-out, $delay: 0s) {
83-
@if $properties == all {
83+
@if $properties ==all {
8484
transition: all $duration $timing $delay;
8585
} @else {
8686
$transitions: ();

assets/src/scss/frontend/dashboard/_announcement-notice.scss

Lines changed: 0 additions & 88 deletions
This file was deleted.

assets/src/scss/frontend/dashboard/_index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
@forward 'stat-card';
1515
@forward 'progress-card';
1616
@forward 'course-card';
17-
@forward 'announcement-notice';
1817

1918
// Page components
2019
@forward 'pages/my-courses';

assets/src/scss/frontend/dashboard/layout/_layout.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@
1616
@include tutor-frontend-layout();
1717
padding-inline: $tutor-spacing-6;
1818
padding-bottom: $tutor-spacing-7;
19-
20-
&:not(:has(.tutor-announcement-notice)) {
21-
padding-top: $tutor-spacing-7;
22-
}
19+
padding-top: $tutor-spacing-7;
2320

2421
@include tutor-breakpoint-down(sm) {
2522
padding-bottom: $tutor-spacing-16;
26-
27-
&:not(:has(.tutor-announcement-notice)) {
28-
padding-top: $tutor-spacing-1;
29-
}
23+
padding-top: $tutor-spacing-1;
3024
}
3125
}
3226
}

assets/src/scss/frontend/kids/_dashboard.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,11 @@
201201
border-radius: $tutor-radius-2xl;
202202
}
203203

204+
// notification drawer
205+
.tutor-pn-drawer-content {
206+
border-width: 0px 2px 5px 2px;
207+
}
208+
204209
// user account/notification
205210
.tutor-profile-notification-card {
206211
@include tutor-kids-shadow(false, $tutor-border-idle, $tutor-radius-5xl, sm);

classes/Instructor.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,7 @@ public static function format_instructor_recent_reviews( $reviews ) {
806806
function ( $review ) {
807807
return array(
808808
'user' => array(
809+
'id' => $review->user_id,
809810
'name' => $review->display_name,
810811
'avatar' => tutor_utils()->get_user_avatar_url( $review->user_id ),
811812
),

components/DropdownFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ class="<?php echo esc_attr( $btn_class ); ?>"
473473
if ( null === $icon_size ) {
474474
$icon_size = in_array( $this->variant, array( Variant::PRIMARY, Variant::PRIMARY_SOFT ), true ) ? 16 : 20;
475475
}
476-
SvgIcon::make()->name( Icon::CHEVRON_DOWN_2 )->size( $icon_size )->color( Color::SECONDARY )->render();
476+
SvgIcon::make()->name( Icon::CHEVRON_DOWN_2 )->size( $icon_size )->color( Variant::PRIMARY_SOFT === $this->variant ? Color::BRAND : Color::SECONDARY )->render();
477477
?>
478478
</button>
479479

0 commit comments

Comments
 (0)