Skip to content

Commit 40d0ec8

Browse files
committed
Lesson content style improved
1 parent 0e243e8 commit 40d0ec8

File tree

4 files changed

+99
-35
lines changed

4 files changed

+99
-35
lines changed

assets/src/scss/frontend/learning-area/_lesson-content.scss

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,64 @@
33
@use '@Core/scss/mixins' as *;
44

55
.tutor-lesson-content {
6+
.tutor-lesson-content-body {
7+
@include tutor-typography('p1', 'regular', 'secondary');
8+
9+
h1 {
10+
@include tutor-typography('h1', 'bold', 'primary', 'heading');
11+
12+
&:not(:last-child) {
13+
margin-bottom: $tutor-spacing-4;
14+
}
15+
}
16+
17+
h2 {
18+
@include tutor-typography('h2', 'bold', 'primary', 'heading');
19+
20+
&:not(:last-child) {
21+
margin-bottom: $tutor-spacing-4;
22+
}
23+
}
24+
25+
h3 {
26+
@include tutor-typography('h3', 'bold', 'primary', 'heading');
27+
28+
&:not(:last-child) {
29+
margin-bottom: $tutor-spacing-4;
30+
}
31+
}
32+
33+
h4 {
34+
@include tutor-typography('h4', 'bold', 'primary', 'heading');
35+
36+
&:not(:last-child) {
37+
margin-bottom: $tutor-spacing-4;
38+
}
39+
}
40+
41+
h5 {
42+
@include tutor-typography('h5', 'bold', 'primary', 'heading');
43+
44+
&:not(:last-child) {
45+
margin-bottom: $tutor-spacing-4;
46+
}
47+
}
48+
49+
p:not(:last-child) {
50+
margin-bottom: $tutor-spacing-8;
51+
}
52+
53+
ul,
54+
ol {
55+
list-style: revert;
56+
padding-inline-start: $tutor-spacing-6;
57+
58+
&:not(:last-child) {
59+
margin-bottom: $tutor-spacing-8;
60+
}
61+
}
62+
}
63+
664
@include tutor-breakpoint-up(sm) {
765
margin-top: $tutor-spacing-4;
866

assets/src/scss/frontend/learning-area/layout/_layout.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
@use '@Core/scss/tokens' as *;
55

66
.tutor-learning-area {
7+
background-color: $tutor-surface-base;
8+
79
.tutor-learning-area-body {
810
padding-inline-start: 320px;
911
position: relative;

templates/learning-area/index.php

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,41 +32,43 @@
3232

3333
?>
3434
<meta name="viewport" content="width=device-width, initial-scale=1" />
35-
<div class="tutor-learning-area<?php echo esc_attr( is_admin_bar_showing() ? ' tutor-has-admin-bar' : '' ); ?>" x-data="{ sidebarOpen: false, isFullScreen: false }" :class="{ 'is-fullscreen': isFullScreen }">
36-
<?php tutor_load_template( 'learning-area.components.header' ); ?>
37-
<div class="tutor-learning-area-body">
38-
<?php tutor_load_template( 'learning-area.components.sidebar' ); ?>
39-
<div class="tutor-learning-area-content">
40-
<div class="tutor-learning-area-container">
41-
<?php
42-
// Get requested page from query string and sanitize.
43-
$subpage = Input::get( 'subpage' );
35+
<body class="tutor-learning-area<?php echo esc_attr( is_admin_bar_showing() ? ' tutor-has-admin-bar' : '' ); ?>">
36+
<div x-data="{ sidebarOpen: false, isFullScreen: false }" :class="{ 'is-fullscreen': isFullScreen }">
37+
<?php tutor_load_template( 'learning-area.components.header' ); ?>
38+
<div class="tutor-learning-area-body">
39+
<?php tutor_load_template( 'learning-area.components.sidebar' ); ?>
40+
<div class="tutor-learning-area-content">
41+
<div class="tutor-learning-area-container">
42+
<?php
43+
// Get requested page from query string and sanitize.
44+
$subpage = Input::get( 'subpage' );
4445

45-
if ( $subpage ) {
46-
$template = $subpages[ $subpage ]['template'] ?? '';
47-
if ( file_exists( $template ) ) {
48-
tutor_load_template_from_custom_path( $template );
46+
if ( $subpage ) {
47+
$template = $subpages[ $subpage ]['template'] ?? '';
48+
if ( file_exists( $template ) ) {
49+
tutor_load_template_from_custom_path( $template );
50+
} else {
51+
do_action( 'tutor_single_content_' . $tutor_current_post_type );
52+
}
4953
} else {
50-
do_action( 'tutor_single_content_' . $tutor_current_post_type );
54+
do_action( 'tutor_single_content_' . $tutor_current_post_type, $tutor_current_post );
5155
}
52-
} else {
53-
do_action( 'tutor_single_content_' . $tutor_current_post_type, $tutor_current_post );
54-
}
55-
?>
56+
?>
57+
</div>
5658
</div>
57-
</div>
58-
<button
59-
class="tutor-btn tutor-btn-outline tutor-btn-small tutor-btn-icon tutor-expand-btn"
60-
@click="isFullScreen = !isFullScreen"
61-
>
62-
<template x-if="!isFullScreen">
63-
<?php tutor_utils()->render_svg_icon( Icon::EXPAND ); ?>
64-
</template>
59+
<button
60+
class="tutor-btn tutor-btn-outline tutor-btn-small tutor-btn-icon tutor-expand-btn"
61+
@click="isFullScreen = !isFullScreen"
62+
>
63+
<template x-if="!isFullScreen">
64+
<?php tutor_utils()->render_svg_icon( Icon::EXPAND ); ?>
65+
</template>
6566

66-
<template x-if="isFullScreen">
67-
<?php tutor_utils()->render_svg_icon( Icon::COLLAPSED ); ?>
68-
</template>
69-
</button>
67+
<template x-if="isFullScreen">
68+
<?php tutor_utils()->render_svg_icon( Icon::COLLAPSED ); ?>
69+
</template>
70+
</button>
71+
</div>
7072
</div>
71-
</div>
72-
<?php wp_footer(); ?>
73+
<?php wp_footer(); ?>
74+
</body>

templates/learning-area/lesson/overview.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515

1616
?>
1717
<div x-show="activeTab === 'overview'" x-cloak class="tutor-tab-panel tutor-p-6 tutor-sm-p-5" role="tabpanel">
18-
<h4 class="tutor-heading-4 tutor-mb-4">
18+
<h4 class="tutor-h4 tutor-mb-4">
1919
<?php the_title(); ?>
2020
</h4>
21-
<?php do_action( 'tutor_lesson_before_the_content', $post, $tutor_course_id ); ?>
22-
<?php the_content(); ?>
21+
<div class="tutor-lesson-content-body">
22+
<?php do_action( 'tutor_lesson_before_the_content', $post, $tutor_course_id ); ?>
23+
<?php the_content(); ?>
24+
</div>
2325
</div>

0 commit comments

Comments
 (0)