Skip to content
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

Jump to bottom

Fix notice style for not logged in users in learning mode #7264

Merged
merged 16 commits into from
Nov 16, 2023
Merged

Fix notice style for not logged in users in learning mode #7264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8363bce
Add additional classes to the notice buttons
Imran92 Nov 3, 2023
67f61a6
Add font size for default variation
Imran92 Nov 3, 2023
6b36901
Add styles for the actions in the notice
Imran92 Nov 3, 2023
405952e
Add changelog
Imran92 Nov 3, 2023
d25ed10
Merge branch 'fix/not-enrolled-notice-style-in-lm' into fix/not-logge…
Imran92 Nov 6, 2023
14d159c
Fix font size of sign in button
Imran92 Nov 6, 2023
27d3992
Move style to variation specific file
Imran92 Nov 6, 2023
355ded9
Fix background and color Purchase Course button
Imran92 Nov 13, 2023
1b014d7
Use different selector to target link style
Imran92 Nov 13, 2023
daa1e9a
Merge branch 'trunk' into fix/not-logged-in-style-in-lm
Imran92 Nov 15, 2023
694cd85
Merge pull request #7285 from Automattic/fix/notice-style-for-paid-co…
Imran92 Nov 15, 2023
f79acc8
Merge branch 'trunk' into fix/not-logged-in-style-in-lm
Imran92 Nov 16, 2023
55ab34f
Fix button text color
Imran92 Nov 16, 2023
53569be
Merge branch 'fix/not-logged-in-style-in-lm' of https://github.com/Au…
Imran92 Nov 16, 2023
6236726
Change the notice text element to paragraph tag
Imran92 Nov 16, 2023
f8e072c
Merge branch 'trunk' into fix/not-logged-in-style-in-lm
Imran92 Nov 16, 2023
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
7 changes: 7 additions & 0 deletions assets/css/3rd-party/themes/course/default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* Styles specific to default variation
*/
.wp-block-sensei-lms-course-theme-notices {
.sensei-course-theme-locked-lesson-notice {
.is-link.sensei-course-theme__button {
font-size: clamp(1.313rem, 1.188rem + 0.417vw, 1.5rem);
}
}
}
10 changes: 2 additions & 8 deletions assets/css/3rd-party/themes/course/learning-mode.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ body {
margin: 0 0 32px;
}

.wp-block-button__link {
.wp-block-button__link, .is-primary {
background-color: var(--wp--preset--color--background);
color: var(--wp--preset--color--primary);
}
Expand All @@ -288,12 +288,6 @@ body {
opacity: 1;
}

.sensei-course-theme-locked-lesson-notice__actions {
.sensei-course-theme__button {
color: var(--wp--preset--color--background, #1e1e1e);
}
}

.sensei-course-theme__quiz__footer {
.sensei-quiz-pagination {
.sensei-quiz-pagination__list {
Expand All @@ -304,4 +298,4 @@ body {
}
}
}
}
}
23 changes: 17 additions & 6 deletions assets/css/sensei-course-theme/notices.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ body.sensei-course-theme {
}
}

&__text {
& > &__text {
font-size: 24px;
font-weight: 700;
line-height: 1.3;
margin-bottom: 20px;

a {
color: inherit;
Expand All @@ -188,10 +189,20 @@ body.sensei-course-theme {
}

&__actions {
display: flex;
list-style: none;
margin: 18px 0 0;
padding: 0;
gap: 12px;
font-size: 18px;

@media (min-width: $break-medium) {
justify-content: space-between;
}

.is-secondary.sensei-course-theme__button {
background-color: transparent;
border: none;
display: block;
font-family: var(--wp--preset--font-family--body);
text-transform: none;
font-weight: normal;
font-size: 18px;
}
}
}
4 changes: 4 additions & 0 deletions changelog/fix-not-logged-in-style-in-lm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Updated styles of the notice that is shown when student is not logged in in learning mode
4 changes: 2 additions & 2 deletions includes/course-theme/class-sensei-course-theme-lesson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,12 @@ private function maybe_add_not_enrolled_notice() {
[
'label' => __( 'Take course', 'sensei-lms' ),
'url' => Sensei()->lesson->get_take_course_url( $course_id ),
'style' => 'primary',
'style' => 'primary wp-block-button__link wp-element-button',
],
[
'label' => __( 'Sign in', 'sensei-lms' ),
'url' => $sign_in_url,
'style' => 'secondary',
'style' => 'secondary wp-element-button is-link',
],
];

Expand Down
2 changes: 1 addition & 1 deletion templates/course-theme/locked-lesson-notice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function sensei_locked_lesson_notices_map( $notice ) {
</div>
</div>
<?php } ?>
<h2 class="sensei-course-theme-locked-lesson-notice__text"><?php echo wp_kses_post( $notice['text'] ); ?></h2>
<p class="sensei-course-theme-locked-lesson-notice__text"><?php echo wp_kses_post( $notice['text'] ); ?></p>

<?php if ( ! empty( $notice['actions'] ) ) { ?>
<div class="sensei-course-theme-locked-lesson-notice__actions">
Expand Down
Loading