From 2dd7f7049f702413086f6e8ed1436173b2810978 Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Thu, 1 Aug 2024 05:59:27 +0900
Subject: [PATCH 1/7] Remove extra screen reader text.

---
 .../themes/pub/wporg-learn-2024/functions.php |  1 +
 .../src/sensei-lesson-actions-a11y/block.json |  4 ++
 .../src/sensei-lesson-actions-a11y/index.php  | 40 +++++++++++++++++++
 .../src/sensei-lesson-actions-a11y/view.js    | 14 +++++++
 4 files changed, 59 insertions(+)
 create mode 100644 wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json
 create mode 100644 wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php
 create mode 100644 wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js

diff --git a/wp-content/themes/pub/wporg-learn-2024/functions.php b/wp-content/themes/pub/wporg-learn-2024/functions.php
index d8058d1ee..9af43d142 100644
--- a/wp-content/themes/pub/wporg-learn-2024/functions.php
+++ b/wp-content/themes/pub/wporg-learn-2024/functions.php
@@ -13,6 +13,7 @@
 require_once __DIR__ . '/src/learning-pathway-cards/index.php';
 require_once __DIR__ . '/src/learning-pathway-header/index.php';
 require_once __DIR__ . '/src/lesson-grid/index.php';
+require_once __DIR__ . '/src/sensei-lesson-actions-a11y/index.php';
 require_once __DIR__ . '/src/search-results-context/index.php';
 require_once __DIR__ . '/src/sensei-progress-bar/index.php';
 require_once __DIR__ . '/src/sidebar-meta-list/index.php';
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json
new file mode 100644
index 000000000..f22a32f84
--- /dev/null
+++ b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json
@@ -0,0 +1,4 @@
+{
+	"name": "wporg-learn/sensei-lesson-actions-a11y",
+	"viewScript": "file:./view.js"
+}
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php
new file mode 100644
index 000000000..3c2b2d77e
--- /dev/null
+++ b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Enhance accessibility for the sensei lesson actions
+ */
+
+namespace WordPressdotorg\Theme\Learn_2024\Sensei_Lesson_Actions_A11y;
+
+defined( 'WPINC' ) || die();
+
+/**
+ * Actions and filters.
+ */
+add_action( 'init', __NAMESPACE__ . '\init' );
+
+/**
+ * Add the scripts to update the sensei lesson actions block.
+ *
+ * The dependencies are autogenerated in block.json, and can be read with
+ * `wp_json_file_decode` & `register_block_script_handle.
+ */
+function init() {
+	$metadata_file = dirname( dirname( __DIR__ ) ) . '/build/sensei-lesson-actions-a11y/block.json';
+	$metadata = wp_json_file_decode( $metadata_file, array( 'associative' => true ) );
+	$metadata['file'] = $metadata_file;
+
+	$script_handle = register_block_script_handle( $metadata, 'viewScript', 0 );
+
+	// Enqueue the assets when the single lesson content pattern is on the page.
+	add_action(
+		'render_block_core/pattern',
+		function( $block_content, $block ) use ( $script_handle ) {
+			if ( isset( $block['attrs']['slug'] ) && 'wporg-learn-2024/single-lesson-content' === $block['attrs']['slug'] ) {
+				wp_enqueue_script( $script_handle );
+			}
+			return $block_content;
+		},
+		10,
+		2
+	);
+}
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js
new file mode 100644
index 000000000..04cad8983
--- /dev/null
+++ b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js
@@ -0,0 +1,14 @@
+function init() {
+	/**
+	 * Enhance the accessibility of the sensei lesson actions.
+	 *
+	 * Because there are additional visible buttons, the extra screen reader text is removed.
+	 */
+	const footerElement = document.querySelector( '.sensei-lesson-footer' );
+	const screenReaderText = footerElement.parentElement.querySelector( '.screen-reader-text' );
+	if ( screenReaderText ) {
+		screenReaderText.remove();
+	}
+}
+
+document.addEventListener( 'DOMContentLoaded', init );

From 89400f3451aa21b416bd42e1bcd0870241c558c0 Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Thu, 1 Aug 2024 06:49:36 +0900
Subject: [PATCH 2/7] Add previous lesson button.

---
 .../patterns/sensei-lesson-actions.php        | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
index 18c6cc4c0..d859f2ea7 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
@@ -7,6 +7,11 @@
  * Original source: https://github.com/Automattic/sensei/blob/af62fb1115daf2063bc56331a7d8b1b3ea805866/themes/sensei-course-theme/templates/default/lesson.php
  */
 
+$prev_next_lessons = sensei_get_prev_next_lessons( get_the_ID() );
+$prev_url = $prev_next_lessons['previous']['url'] ?? null;
+$next_url = $prev_next_lessons['next']['url'] ?? null;
+$is_completed = Sensei_Utils::user_completed_lesson( get_the_ID() );
+
 ?>
 
 <!-- wp:sensei-lms/lesson-actions {"toggledBlocks":{"sensei-lms/button-reset-lesson":false}} -->
@@ -28,21 +33,26 @@
 		</div>
 		<!-- /wp:sensei-lms/button-view-quiz -->
 
-		<!-- wp:sensei-lms/button-lesson-completed {"inContainer":true,"className":"is-style-outline"} -->
-		<div class="wp-block-sensei-lms-button-lesson-completed is-style-outline sensei-buttons-container__button-block wp-block-sensei-lms-button-lesson-completed__wrapper">
-			<div class="wp-block-sensei-lms-button-lesson-completed is-style-outline wp-block-sensei-button wp-block-button has-text-align-left">
-				<div class="wp-block-button__link"><?php esc_html_e( 'Completed', 'sensei-lms' ); ?></div>
+		<?php if ( $is_completed ) : ?>
+			<!-- wp:buttons -->
+			<div class="wp-block-buttons">
+				<?php if ( $prev_url ) : ?>
+					<!-- wp:button {"className":"is-style-outline"} -->
+					<div class="wp-block-button is-style-outline has-text-align-left">
+						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
+					</div>
+					<!-- /wp:button -->
+				<?php endif; ?>
+				<?php if ( $next_url ) : ?>
+					<!-- wp:button {"className":"is-style-fill"} -->
+					<div class="wp-block-button is-style-fill has-text-align-left">
+						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
+					</div>
+					<!-- /wp:button -->
+				<?php endif; ?>
 			</div>
-		</div>
-		<!-- /wp:sensei-lms/button-lesson-completed -->
-
-		<!-- wp:sensei-lms/button-next-lesson {"inContainer":true} -->
-		<div class="wp-block-sensei-lms-button-next-lesson is-style-default sensei-buttons-container__button-block wp-block-sensei-lms-button-next-lesson__wrapper">
-			<div class="wp-block-sensei-lms-button-next-lesson is-style-default wp-block-sensei-button wp-block-button has-text-align-left">
-				<div class="wp-block-button__link"><?php esc_html_e( 'Next lesson', 'sensei-lms' ); ?></div>
-			</div>
-		</div>
-		<!-- /wp:sensei-lms/button-next-lesson -->
+			<!-- /wp:buttons -->			
+		<?php endif; ?>
 	</div>
 </div>
 <!-- /wp:sensei-lms/lesson-actions -->

From 4d465ec31e01ca936f71a92cd5e30f7ad6c0f4e6 Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Thu, 1 Aug 2024 22:48:29 +0900
Subject: [PATCH 3/7] Add lesson complete indicator

---
 .../patterns/sensei-lesson-actions.php        | 37 ++++++++++++-------
 .../wporg-learn-2024/src/style/_sensei.scss   |  8 +---
 .../pub/wporg-learn-2024/src/style/style.scss |  6 +++
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
index d859f2ea7..ccd203c7c 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
@@ -36,19 +36,30 @@
 		<?php if ( $is_completed ) : ?>
 			<!-- wp:buttons -->
 			<div class="wp-block-buttons">
-				<?php if ( $prev_url ) : ?>
-					<!-- wp:button {"className":"is-style-outline"} -->
-					<div class="wp-block-button is-style-outline has-text-align-left">
-						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
-					</div>
-					<!-- /wp:button -->
-				<?php endif; ?>
-				<?php if ( $next_url ) : ?>
-					<!-- wp:button {"className":"is-style-fill"} -->
-					<div class="wp-block-button is-style-fill has-text-align-left">
-						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
-					</div>
-					<!-- /wp:button -->
+				<!-- wp:button {"className":"is-style-outline"} -->
+				<div class="wp-block-button is-style-outline has-text-align-left disabled">
+					<a class="wp-block-button__link wp-element-button"><?php esc_html_e( 'Lesson completed', 'wporg-learn' ); ?></a>
+				</div>
+				<!-- /wp:button -->
+				<?php if ( $prev_url || $next_url ) : ?>
+				<!-- wp:buttons {"className":"sensei-lesson-actions-nav"} -->
+				<div class="wp-block-buttons sensei-lesson-actions-nav">
+					<?php if ( $prev_url ) : ?>
+						<!-- wp:button {"className":"is-style-outline"} -->
+						<div class="wp-block-button is-style-outline has-text-align-left">
+							<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
+						</div>
+						<!-- /wp:button -->
+					<?php endif; ?>
+					<?php if ( $next_url ) : ?>
+						<!-- wp:button {"className":"is-style-fill"} -->
+						<div class="wp-block-button is-style-fill has-text-align-left">
+							<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
+						</div>
+						<!-- /wp:button -->
+					<?php endif; ?>
+				</div>
+				<!-- /wp:buttons -->
 				<?php endif; ?>
 			</div>
 			<!-- /wp:buttons -->			
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss b/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
index 7c395d3cd..7c6034cdf 100644
--- a/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
+++ b/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
@@ -102,12 +102,8 @@ body.sensei {
 	}
 
 	@media screen and (max-width: 782px) {
-		.sensei-lesson-footer .wp-block-sensei-lms-button-lesson-completed {
-			display: flex;
-
-			.wp-block-button__link {
-				flex: 1;
-			}
+		.sensei-lesson-footer .sensei-lesson-actions-nav {
+			width: 100%;
 		}
 	}
 
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss b/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss
index 1f58987a4..2d4ce0e02 100644
--- a/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss
+++ b/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss
@@ -51,3 +51,9 @@ body {
 		padding-top: unset !important;
 	}
 }
+
+.disabled {
+	color: var(--wp--preset--color--charcoal-5) !important;
+	border-color: var(--wp--preset--color--charcoal-5) !important;
+	pointer-events: none;
+}

From 15a7907bebd46ebeda558be48f643b302f770913 Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Fri, 2 Aug 2024 02:21:47 +0900
Subject: [PATCH 4/7] Revert "Remove extra screen reader text."

This reverts commit 2dd7f7049f702413086f6e8ed1436173b2810978.
---
 .../themes/pub/wporg-learn-2024/functions.php |  1 -
 .../src/sensei-lesson-actions-a11y/block.json |  4 --
 .../src/sensei-lesson-actions-a11y/index.php  | 40 -------------------
 .../src/sensei-lesson-actions-a11y/view.js    | 14 -------
 4 files changed, 59 deletions(-)
 delete mode 100644 wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json
 delete mode 100644 wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php
 delete mode 100644 wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js

diff --git a/wp-content/themes/pub/wporg-learn-2024/functions.php b/wp-content/themes/pub/wporg-learn-2024/functions.php
index 9af43d142..d8058d1ee 100644
--- a/wp-content/themes/pub/wporg-learn-2024/functions.php
+++ b/wp-content/themes/pub/wporg-learn-2024/functions.php
@@ -13,7 +13,6 @@
 require_once __DIR__ . '/src/learning-pathway-cards/index.php';
 require_once __DIR__ . '/src/learning-pathway-header/index.php';
 require_once __DIR__ . '/src/lesson-grid/index.php';
-require_once __DIR__ . '/src/sensei-lesson-actions-a11y/index.php';
 require_once __DIR__ . '/src/search-results-context/index.php';
 require_once __DIR__ . '/src/sensei-progress-bar/index.php';
 require_once __DIR__ . '/src/sidebar-meta-list/index.php';
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json
deleted file mode 100644
index f22a32f84..000000000
--- a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/block.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"name": "wporg-learn/sensei-lesson-actions-a11y",
-	"viewScript": "file:./view.js"
-}
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php
deleted file mode 100644
index 3c2b2d77e..000000000
--- a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Enhance accessibility for the sensei lesson actions
- */
-
-namespace WordPressdotorg\Theme\Learn_2024\Sensei_Lesson_Actions_A11y;
-
-defined( 'WPINC' ) || die();
-
-/**
- * Actions and filters.
- */
-add_action( 'init', __NAMESPACE__ . '\init' );
-
-/**
- * Add the scripts to update the sensei lesson actions block.
- *
- * The dependencies are autogenerated in block.json, and can be read with
- * `wp_json_file_decode` & `register_block_script_handle.
- */
-function init() {
-	$metadata_file = dirname( dirname( __DIR__ ) ) . '/build/sensei-lesson-actions-a11y/block.json';
-	$metadata = wp_json_file_decode( $metadata_file, array( 'associative' => true ) );
-	$metadata['file'] = $metadata_file;
-
-	$script_handle = register_block_script_handle( $metadata, 'viewScript', 0 );
-
-	// Enqueue the assets when the single lesson content pattern is on the page.
-	add_action(
-		'render_block_core/pattern',
-		function( $block_content, $block ) use ( $script_handle ) {
-			if ( isset( $block['attrs']['slug'] ) && 'wporg-learn-2024/single-lesson-content' === $block['attrs']['slug'] ) {
-				wp_enqueue_script( $script_handle );
-			}
-			return $block_content;
-		},
-		10,
-		2
-	);
-}
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js b/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js
deleted file mode 100644
index 04cad8983..000000000
--- a/wp-content/themes/pub/wporg-learn-2024/src/sensei-lesson-actions-a11y/view.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function init() {
-	/**
-	 * Enhance the accessibility of the sensei lesson actions.
-	 *
-	 * Because there are additional visible buttons, the extra screen reader text is removed.
-	 */
-	const footerElement = document.querySelector( '.sensei-lesson-footer' );
-	const screenReaderText = footerElement.parentElement.querySelector( '.screen-reader-text' );
-	if ( screenReaderText ) {
-		screenReaderText.remove();
-	}
-}
-
-document.addEventListener( 'DOMContentLoaded', init );

From fa117b4be5afcb54439e0638c199ff5ab8e4edc5 Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Fri, 2 Aug 2024 02:42:08 +0900
Subject: [PATCH 5/7] Remove lesson completed

---
 .../patterns/sensei-lesson-actions.php        | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
index ccd203c7c..fc5079168 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
@@ -33,36 +33,25 @@
 		</div>
 		<!-- /wp:sensei-lms/button-view-quiz -->
 
-		<?php if ( $is_completed ) : ?>
-			<!-- wp:buttons -->
-			<div class="wp-block-buttons">
-				<!-- wp:button {"className":"is-style-outline"} -->
-				<div class="wp-block-button is-style-outline has-text-align-left disabled">
-					<a class="wp-block-button__link wp-element-button"><?php esc_html_e( 'Lesson completed', 'wporg-learn' ); ?></a>
-				</div>
-				<!-- /wp:button -->
-				<?php if ( $prev_url || $next_url ) : ?>
-				<!-- wp:buttons {"className":"sensei-lesson-actions-nav"} -->
-				<div class="wp-block-buttons sensei-lesson-actions-nav">
-					<?php if ( $prev_url ) : ?>
-						<!-- wp:button {"className":"is-style-outline"} -->
-						<div class="wp-block-button is-style-outline has-text-align-left">
-							<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
-						</div>
-						<!-- /wp:button -->
-					<?php endif; ?>
-					<?php if ( $next_url ) : ?>
-						<!-- wp:button {"className":"is-style-fill"} -->
-						<div class="wp-block-button is-style-fill has-text-align-left">
-							<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
-						</div>
-						<!-- /wp:button -->
-					<?php endif; ?>
-				</div>
-				<!-- /wp:buttons -->
+		<?php if ( $is_completed && ( $prev_url || $next_url ) ) : ?>
+			<!-- wp:buttons {"className":"sensei-lesson-actions-nav"} -->
+			<div class="wp-block-buttons sensei-lesson-actions-nav">
+				<?php if ( $prev_url ) : ?>
+					<!-- wp:button {"className":"is-style-outline"} -->
+					<div class="wp-block-button is-style-outline has-text-align-left">
+						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
+					</div>
+					<!-- /wp:button -->
+				<?php endif; ?>
+				<?php if ( $next_url ) : ?>
+					<!-- wp:button {"className":"is-style-fill"} -->
+					<div class="wp-block-button is-style-fill has-text-align-left">
+						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
+					</div>
+					<!-- /wp:button -->
 				<?php endif; ?>
 			</div>
-			<!-- /wp:buttons -->			
+			<!-- /wp:buttons -->
 		<?php endif; ?>
 	</div>
 </div>

From 2899198302c26a50ce1368b888370bd7be01781a Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Fri, 2 Aug 2024 02:55:36 +0900
Subject: [PATCH 6/7] Do not display screen reader text.

---
 .../patterns/sensei-lesson-columns.php        |  8 ++++----
 .../patterns/sensei-lesson-standalone.php     |  8 ++++----
 .../wporg-learn-2024/src/style/_sensei.scss   | 20 ++++++++++++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php
index 2bae0ff70..f4e742060 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php
@@ -29,12 +29,12 @@
 
 		<!-- wp:post-content {"layout":{"inherit":true}} /-->
 
-		<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"}} -->
-		<div class="wp-block-group" style="margin-top:40px">
+		<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"},"className":"sensei-lesson-footer"} -->
+		<div class="wp-block-group sensei-lesson-footer" style="margin-top:40px">
 			<!-- wp:sensei-lms/page-actions {"style":{"spacing":{"blockGap":"43px"}}} /-->
 
-			<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}},"className":"sensei-lesson-footer"} -->
-			<div class="wp-block-group sensei-lesson-footer" style="margin-top:20px">
+			<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}}} -->
+			<div class="wp-block-group" style="margin-top:20px">
 
 				<!-- wp:pattern {"slug":"wporg-learn-2024/sensei-lesson-actions"} /-->
 
diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php
index 2f51a032b..1f110c196 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php
@@ -41,12 +41,12 @@
 
 		<!-- wp:post-content {"layout":{"inherit":true}} /-->
 
-		<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"}} -->
-		<div class="wp-block-group" style="margin-top:40px">
+		<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"},"className":"sensei-lesson-footer"} -->
+		<div class="wp-block-group sensei-lesson-footer" style="margin-top:40px">
 			<!-- wp:sensei-lms/page-actions {"style":{"spacing":{"blockGap":"43px"}}} /-->
 
-			<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}},"className":"sensei-lesson-footer","layout":{"type":"flex","flexWrap":"nowrap"}} -->
-			<div class="wp-block-group sensei-lesson-footer" style="margin-top:20px">
+			<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+			<div class="wp-block-group" style="margin-top:20px">
 
 				<!-- wp:pattern {"slug":"wporg-learn-2024/sensei-lesson-actions"} /-->
 
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss b/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
index 7c6034cdf..7a565923c 100644
--- a/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
+++ b/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
@@ -69,14 +69,20 @@ body.sensei {
 	}
 
 	&.single-lesson {
-		.sensei-lesson-footer .sensei-buttons-container {
-			margin: unset;
-			display: flex;
-			gap: var(--wp--preset--spacing--10);
+		.sensei-lesson-footer {
+			.screen-reader-text {
+				display: none;
+			}
 
-			> *,
-			.sensei-buttons-container__button-block {
-				padding: unset;
+			.sensei-buttons-container {
+				margin: unset;
+				display: flex;
+				gap: var(--wp--preset--spacing--10);
+
+				> *,
+				.sensei-buttons-container__button-block {
+					padding: unset;
+				}
 			}
 		}
 

From 21f09df1a82f93163fe19a001e35f21b7a46413f Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Fri, 2 Aug 2024 04:00:39 +0900
Subject: [PATCH 7/7] Remove unused CSS.

---
 wp-content/themes/pub/wporg-learn-2024/src/style/style.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss b/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss
index 2d4ce0e02..1f58987a4 100644
--- a/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss
+++ b/wp-content/themes/pub/wporg-learn-2024/src/style/style.scss
@@ -51,9 +51,3 @@ body {
 		padding-top: unset !important;
 	}
 }
-
-.disabled {
-	color: var(--wp--preset--color--charcoal-5) !important;
-	border-color: var(--wp--preset--color--charcoal-5) !important;
-	pointer-events: none;
-}