Skip to content

Commit d0becc0

Browse files
sazedul-haquesazedul-haque
committed
Course info and learning area layout fixed
1 parent ba50e3c commit d0becc0

5 files changed

Lines changed: 40 additions & 41 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
}
7878

7979
@include tutor-breakpoint-down(sm) {
80+
margin-inline: -$tutor-spacing-6;
81+
8082
.tutor-lesson-content-tab {
8183
padding-inline: $tutor-spacing-6;
8284

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@
3333

3434
.tutor-learning-area-container {
3535
max-width: 780px;
36+
padding-inline: $tutor-spacing-6;
3637
margin: 0 auto;
3738

38-
@include tutor-breakpoint-up(sm) {
39-
padding-inline: $tutor-spacing-6;
40-
}
41-
4239
@include tutor-breakpoint-down(sm) {
4340
padding-bottom : 62px;
4441
}

‎assets/src/scss/frontend/learning-area/pages/_course-info.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
img {
1212
border-radius: $tutor-radius-lg;
13+
width: 100%;
1314
max-width: 100%;
1415
}
1516
}
@@ -76,6 +77,7 @@
7677
}
7778

7879
.tutor-course-description-body {
80+
@include tutor-typography(p3);
7981
margin-top: $tutor-spacing-5;
8082
}
8183
}

‎templates/learning-area/index.php‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -86,42 +86,40 @@
8686
$subpages = Template::make_learning_area_sub_page_nav_items();
8787
?>
8888
<body <?php body_class(); ?>>
89-
<div class="tutor-learning-area<?php echo esc_attr( is_admin_bar_showing() ? ' tutor-has-admin-bar' : '' ); ?>">
90-
<div x-data="{ sidebarOpen: false, isFullScreen: false }" :class="{ 'is-fullscreen': isFullScreen }">
91-
<?php tutor_load_template( 'learning-area.components.header' ); ?>
92-
<div class="tutor-learning-area-body">
93-
<?php tutor_load_template( 'learning-area.components.sidebar' ); ?>
94-
<div class="tutor-learning-area-content">
95-
<div class="tutor-learning-area-container">
96-
<?php
97-
// Get requested page from query string and sanitize.
98-
$subpage = Input::get( 'subpage' );
99-
if ( $subpage ) {
100-
$template = $subpages[ $subpage ]['template'] ?? '';
101-
if ( file_exists( $template ) ) {
102-
tutor_load_template_from_custom_path( $template );
103-
} else {
104-
do_action( 'tutor_single_content_' . $tutor_current_post_type );
105-
}
89+
<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 }">
90+
<?php tutor_load_template( 'learning-area.components.header' ); ?>
91+
<div class="tutor-learning-area-body">
92+
<?php tutor_load_template( 'learning-area.components.sidebar' ); ?>
93+
<div class="tutor-learning-area-content">
94+
<div class="tutor-learning-area-container">
95+
<?php
96+
// Get requested page from query string and sanitize.
97+
$subpage = Input::get( 'subpage' );
98+
if ( $subpage ) {
99+
$template = $subpages[ $subpage ]['template'] ?? '';
100+
if ( file_exists( $template ) ) {
101+
tutor_load_template_from_custom_path( $template );
106102
} else {
107-
do_action( 'tutor_single_content_' . $tutor_current_post_type, $tutor_current_post );
103+
do_action( 'tutor_single_content_' . $tutor_current_post_type );
108104
}
109-
?>
110-
</div>
105+
} else {
106+
do_action( 'tutor_single_content_' . $tutor_current_post_type, $tutor_current_post );
107+
}
108+
?>
111109
</div>
112-
<button
113-
class="tutor-btn tutor-btn-outline tutor-btn-small tutor-btn-icon tutor-expand-btn"
114-
@click="isFullScreen = !isFullScreen"
115-
>
116-
<template x-if="!isFullScreen">
117-
<?php tutor_utils()->render_svg_icon( Icon::EXPAND ); ?>
118-
</template>
119-
120-
<template x-if="isFullScreen">
121-
<?php tutor_utils()->render_svg_icon( Icon::COLLAPSED ); ?>
122-
</template>
123-
</button>
124110
</div>
111+
<button
112+
class="tutor-btn tutor-btn-outline tutor-btn-small tutor-btn-icon tutor-expand-btn"
113+
@click="isFullScreen = !isFullScreen"
114+
>
115+
<template x-if="!isFullScreen">
116+
<?php tutor_utils()->render_svg_icon( Icon::EXPAND ); ?>
117+
</template>
118+
119+
<template x-if="isFullScreen">
120+
<?php tutor_utils()->render_svg_icon( Icon::COLLAPSED ); ?>
121+
</template>
122+
</button>
125123
</div>
126124
</div>
127125
<?php wp_footer(); ?>

‎templates/learning-area/subpages/course-info.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119

120120
$metadata = apply_filters( 'tutor_learning_area_course_info_metadata', $default_meta, $tutor_course_id );
121121
?>
122-
<div class="tutor-course-info tutor-pt-7 tutor-pb-12">
122+
<div class="tutor-course-info tutor-pt-7 tutor-pb-8">
123123
<?php do_action( 'tutor_learning_area_before_course_info', $tutor_course_id ); ?>
124124

125125
<div class="tutor-course-thumb">
@@ -146,7 +146,7 @@
146146
</div>
147147

148148
<!-- TODO: sticky behaviour -->
149-
<div class="tutor-course-sticky-card tutor-mt-9">
149+
<!-- <div class="tutor-course-sticky-card tutor-mt-9">
150150
<div class="tutor-course-thumb">
151151
<img src="<?php echo esc_url( $course_thumbnail ); ?>" alt="course thumb" />
152152
</div>
@@ -164,10 +164,10 @@
164164
?>
165165
</div>
166166
</div>
167-
</div>
167+
</div> -->
168168

169169
<div class="tutor-course-description">
170-
<div x-data="{ expanded: true }" class="tutor-course-description-item">
170+
<div x-data="{ expanded: false }" class="tutor-course-description-item">
171171
<div role="button" @click="expanded = !expanded" class="tutor-course-description-header">
172172
<div class="tutor-course-description-header-title">
173173
<?php esc_html_e( 'About this Course', 'tutor' ); ?>
@@ -183,7 +183,7 @@
183183
<div x-data="{ expanded: false }" class="tutor-course-description-item">
184184
<div role="button" @click="expanded = !expanded" class="tutor-course-description-header">
185185
<div class="tutor-course-description-header-title">
186-
What you'll learn
186+
<?php esc_html_e( "What you'll learn", 'tutor' ); ?>
187187
</div>
188188
<div class="tutor-course-description-header-icon" :class="{ 'is-expanded': expanded }">
189189
<?php tutor_utils()->render_svg_icon( Icon::CHEVRON_DOWN_2, 24, 24 ); ?>

0 commit comments

Comments
 (0)