From adc8f48f5e4adcebe9e12b5b515d47dc21a3bd72 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:18:16 -0500
Subject: [PATCH 1/9] Update homepage header

---
 .../wporg-developer-2023/patterns/front-page-header.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/patterns/front-page-header.php b/source/wp-content/themes/wporg-developer-2023/patterns/front-page-header.php
index bac2eff2e..765b3db57 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/front-page-header.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/front-page-header.php
@@ -9,9 +9,7 @@
 
 <!-- wp:wporg/local-navigation-bar {"backgroundColor":"charcoal-2","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"},":hover":{"color":{"text":"var:preset|color|white"}}}}},"textColor":"white","fontSize":"small"} -->
 
-	<!-- wp:html -->
-	<div style="height:calc(var(--wp--custom--body--small--typography--line-height) * var(--wp--preset--font-size--small));" aria-hidden="true"></div>
-	<!-- /wp:html -->
+	<!-- wp:site-title {"level":0,"fontSize":"small","className":"wporg-local-navigation-bar__show-on-scroll"} /-->
 
 	<!-- wp:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"developer"} /-->
 

From f88e0b927358bc2c62d19bef3f1452dcc7cb7152 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Tue, 6 Feb 2024 17:39:30 -0500
Subject: [PATCH 2/9] New block: Add a page title block which can be used for
 single, archive, and search page titles.

---
 .../themes/wporg-developer-2023/functions.php |  1 +
 .../src/page-title/block.json                 | 28 +++++++++++
 .../src/page-title/index.js                   | 17 +++++++
 .../src/page-title/index.php                  | 50 +++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 source/wp-content/themes/wporg-developer-2023/src/page-title/block.json
 create mode 100644 source/wp-content/themes/wporg-developer-2023/src/page-title/index.js
 create mode 100644 source/wp-content/themes/wporg-developer-2023/src/page-title/index.php

diff --git a/source/wp-content/themes/wporg-developer-2023/functions.php b/source/wp-content/themes/wporg-developer-2023/functions.php
index 1a61ae532..044ae948b 100644
--- a/source/wp-content/themes/wporg-developer-2023/functions.php
+++ b/source/wp-content/themes/wporg-developer-2023/functions.php
@@ -177,6 +177,7 @@
 require_once __DIR__ . '/src/command-github/block.php';
 require_once __DIR__ . '/src/command-title/block.php';
 require_once __DIR__ . '/src/command-subcommand/block.php';
+require_once __DIR__ . '/src/page-title/index.php';
 require_once __DIR__ . '/src/reference-new-updated/block.php';
 require_once __DIR__ . '/src/resource-select/index.php';
 require_once __DIR__ . '/src/search-filters/index.php';
diff --git a/source/wp-content/themes/wporg-developer-2023/src/page-title/block.json b/source/wp-content/themes/wporg-developer-2023/src/page-title/block.json
new file mode 100644
index 000000000..ffa7f300b
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/src/page-title/block.json
@@ -0,0 +1,28 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "wporg/page-title",
+	"version": "0.1.0",
+	"title": "Page Title",
+	"category": "widgets",
+	"description": "Page Title",
+    "attributes": {
+		"level": {
+			"type": "integer",
+			"default": 1
+		}
+	},
+	"supports": {
+		"html": false,
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true
+		}
+	},
+	"textdomain": "wporg",
+	"editorScript": "file:./index.js"
+}
diff --git a/source/wp-content/themes/wporg-developer-2023/src/page-title/index.js b/source/wp-content/themes/wporg-developer-2023/src/page-title/index.js
new file mode 100644
index 000000000..abba51c28
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/src/page-title/index.js
@@ -0,0 +1,17 @@
+/**
+ * WordPress dependencies
+ */
+import { registerBlockType } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import Edit from '../shared/dynamic-edit';
+import metadata from './block.json';
+
+registerBlockType( metadata.name, {
+	/**
+	 * @see ./edit.js
+	 */
+	edit: Edit,
+} );
diff --git a/source/wp-content/themes/wporg-developer-2023/src/page-title/index.php b/source/wp-content/themes/wporg-developer-2023/src/page-title/index.php
new file mode 100644
index 000000000..24541a676
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/src/page-title/index.php
@@ -0,0 +1,50 @@
+<?php
+namespace WordPressdotorg\Theme\Developer_2023\Page_Title;
+
+add_action( 'init', __NAMESPACE__ . '\init' );
+
+/**
+ * Registers the block using the metadata loaded from the `block.json` file.
+ * Behind the scenes, it registers also all assets so they can be enqueued
+ * through the block editor in the corresponding context.
+ *
+ * @see https://developer.wordpress.org/reference/functions/register_block_type/
+ */
+function init() {
+	register_block_type(
+		dirname( dirname( __DIR__ ) ) . '/build/page-title',
+		array(
+			'render_callback' => __NAMESPACE__ . '\render',
+		)
+	);
+}
+
+/**
+ * Render the block content.
+ *
+ * @return string Returns the block markup.
+ */
+function render( $attributes, $content, $block ) {
+	$tag_name = 'h1';
+	if ( isset( $attributes['level'] ) ) {
+		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
+	}
+
+	$title = get_the_title();
+
+	if ( is_search() ) {
+		$title = __( 'Search results', 'wporg' );
+	} elseif ( is_archive() ) {
+		$title = get_the_archive_title();
+	} elseif ( in_array( get_post_type(), array( 'wp-parser-function', 'wp-parser-method' ) ) ) {
+		$title .= '()';
+	}
+
+	$wrapper_attributes = get_block_wrapper_attributes();
+	return sprintf(
+		'<%1$s %2$s>%3$s</section>',
+		$tag_name,
+		$wrapper_attributes,
+		$title,
+	);
+}

From 88116ffc48aa4062a7bb6120a88468384e61cced Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:51:26 -0500
Subject: [PATCH 3/9] Add the "Level 2 B" header variation as "header-alt"

---
 .../wporg-developer-2023/parts/header-alt.html    | 15 +++++++++++++++
 .../themes/wporg-developer-2023/parts/header.html | 11 +----------
 .../wporg-developer-2023/templates/archive.html   |  2 +-
 .../templates/page-dashicons.html                 |  2 +-
 .../wporg-developer-2023/templates/search.html    |  2 +-
 .../templates/single-handbook.html                |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 source/wp-content/themes/wporg-developer-2023/parts/header-alt.html

diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html b/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html
new file mode 100644
index 000000000..668cd7c3d
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html
@@ -0,0 +1,15 @@
+<!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->
+
+<!-- wp:wporg/local-navigation-bar {"className":"has-display-contents","backgroundColor":"charcoal-2","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"},":hover":{"color":{"text":"var:preset|color|white"}}}}},"textColor":"white","fontSize":"small"} -->
+
+	<!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"textColor":"light-grey-1","layout":{"type":"flex","flexWrap":"nowrap"}} -->
+	<div class="wp-block-group has-light-grey-1-color has-text-color">
+		<!-- wp:site-title {"level":0,"fontSize":"small","textColor":"white"} /-->
+
+		<!-- wp:wporg/page-title {"level":0,"fontSize":"small","fontFamily":"inter"} /-->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"developer"} /-->
+
+<!-- /wp:wporg/local-navigation-bar -->
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header.html b/source/wp-content/themes/wporg-developer-2023/parts/header.html
index 6542d790a..67667df02 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header.html
@@ -5,14 +5,5 @@
 	<!-- wp:site-title {"level":0,"fontSize":"small"} /-->
 
 	<!-- wp:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"developer"} /-->
-		
-<!-- /wp:wporg/local-navigation-bar -->
-
 
-<!-- wp:group {"className":"wporg-breadcrumbs","align":"full","style":{"spacing":{"padding":{"top":"18px","bottom":"18px","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"backgroundColor":"white","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
-<div class="wporg-breadcrumbs wp-block-group alignfull has-white-background-color has-background" style="padding-top:18px;padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:18px;padding-left:var(--wp--preset--spacing--edge-space)">
-	
-	<!-- wp:wporg/site-breadcrumbs {"fontSize":"small"} /-->
-
-</div>
-<!-- /wp:group -->
+<!-- /wp:wporg/local-navigation-bar -->
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/archive.html b/source/wp-content/themes/wporg-developer-2023/templates/archive.html
index 5fb5ec1b6..c6c68661a 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/archive.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/archive.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
+<!-- wp:template-part {"slug":"header-alt","className":"has-display-contents"} /-->
 
 <!-- wp:template-part {"slug":"search","className":"has-display-contents"} /-->
 
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/page-dashicons.html b/source/wp-content/themes/wporg-developer-2023/templates/page-dashicons.html
index b6377a0e2..b10c28755 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/page-dashicons.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/page-dashicons.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
+<!-- wp:template-part {"slug":"header-alt","className":"has-display-contents"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)"><!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/search.html b/source/wp-content/themes/wporg-developer-2023/templates/search.html
index 9ece06540..06dd6d730 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/search.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/search.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
+<!-- wp:template-part {"slug":"header-alt","className":"has-display-contents"} /-->
 
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained","justifyContent":"left"},"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}}} -->
 <main class="wp-block-group alignfull" style="padding-left:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space)">
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
index e285f8075..468ad81bd 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
+<!-- wp:template-part {"slug":"header-alt","className":"has-display-contents"} /-->
 
 <!-- wp:template-part {"slug":"search-wide","className":"has-display-contents"} /-->
 

From 2393269b62b230a94b0f6208ef1c736af4ec61f1 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:08:35 -0500
Subject: [PATCH 4/9] Block Hooks: Update template part depending on the
 current page.

---
 .../wporg-developer-2023/inc/block-hooks.php  | 30 +++++++++++++++++++
 .../parts/header-third.html                   | 28 +++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 source/wp-content/themes/wporg-developer-2023/parts/header-third.html

diff --git a/source/wp-content/themes/wporg-developer-2023/inc/block-hooks.php b/source/wp-content/themes/wporg-developer-2023/inc/block-hooks.php
index 2be763f16..8622d82f9 100644
--- a/source/wp-content/themes/wporg-developer-2023/inc/block-hooks.php
+++ b/source/wp-content/themes/wporg-developer-2023/inc/block-hooks.php
@@ -8,6 +8,7 @@
 use function DevHub\is_parsed_post_type;
 
 add_filter( 'render_block', __NAMESPACE__ . '\filter_handbook_meta_link_block', 10, 2 );
+add_filter( 'render_block_data', __NAMESPACE__ . '\modify_header_template_part' );
 
 /**
  * Filters the search block and conditionally inserts search filters.
@@ -77,3 +78,32 @@ function filter_handbook_meta_link_block( $block_content, $block ) {
 
 	return $block_content;
 }
+
+/**
+ * Update header template based on current query.
+ *
+ * @param array $parsed_block The block being rendered.
+ *
+ * @return array The updated block.
+ */
+function modify_header_template_part( $parsed_block ) {
+	if (
+		'core/template-part' === $parsed_block['blockName'] &&
+		! empty( $parsed_block['attrs']['slug'] ) &&
+		str_starts_with( $parsed_block['attrs']['slug'], 'header' )
+	) {
+		$template_slug = 'header-third';
+		if (
+			function_exists( 'wporg_is_handbook' ) &&
+			wporg_is_handbook() &&
+			! wporg_is_handbook_landing_page()
+		) {
+			$parsed_block['attrs']['slug'] = $template_slug;
+		} elseif ( 'command' === get_post_type() && is_single() ) {
+			$parsed_block['attrs']['slug'] = $template_slug;
+		} elseif ( is_parsed_post_type() && ! is_search() ) {
+			$parsed_block['attrs']['slug'] = $template_slug;
+		}
+	}
+	return $parsed_block;
+}
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header-third.html b/source/wp-content/themes/wporg-developer-2023/parts/header-third.html
new file mode 100644
index 000000000..55b891393
--- /dev/null
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header-third.html
@@ -0,0 +1,28 @@
+<!--
+	This template part is not called directly from any templates, it's swapped out automatically by `modify_header_template_part`.
+	It should be used on "Level 3+" pages, pages with at least 2 ancestors (for example, Home > Handbook home > Article).
+-->
+
+<!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->
+
+<!-- wp:wporg/local-navigation-bar {"className":"has-display-contents","backgroundColor":"charcoal-2","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"},":hover":{"color":{"text":"var:preset|color|white"}}}}},"textColor":"white","fontSize":"small"} -->
+
+	<!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"textColor":"light-grey-1","layout":{"type":"flex","flexWrap":"nowrap"}} -->
+	<div class="wp-block-group has-light-grey-1-color has-text-color">
+		<!-- wp:site-title {"level":0,"fontSize":"small","textColor":"white"} /-->
+
+		<!-- wp:wporg/page-title {"level":0,"fontSize":"small","fontFamily":"inter"} /-->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"developer"} /-->
+
+<!-- /wp:wporg/local-navigation-bar -->
+
+<!-- wp:group {"className":"wporg-breadcrumbs","align":"full","style":{"spacing":{"padding":{"top":"18px","bottom":"18px","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"backgroundColor":"white","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
+<div class="wporg-breadcrumbs wp-block-group alignfull has-white-background-color has-background" style="padding-top:18px;padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:18px;padding-left:var(--wp--preset--spacing--edge-space)">
+
+	<!-- wp:wporg/site-breadcrumbs {"fontSize":"small"} /-->
+
+</div>
+<!-- /wp:group -->

From 0fb9698faed703bd352209993eb50431b27450a5 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Thu, 8 Feb 2024 12:11:41 -0500
Subject: [PATCH 5/9] Unhide breadcrumbs on small screens

---
 .../themes/wporg-developer-2023/src/style/style.scss          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
index a44882a57..fb84b6662 100644
--- a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
+++ b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
@@ -7,10 +7,6 @@
 	// If the breadcrumbs are present, the space after them needs to be reduced.
 	// The next content is typically the search field.
 	margin-bottom: calc(var(--wp--preset--spacing--10) * -1);
-
-	@media (max-width: 767px) {
-		display: none !important;
-	}
 }
 
 pre {

From 116121c84e6e2375344c48ab08b6879ee722a327 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Fri, 16 Feb 2024 18:00:01 -0500
Subject: [PATCH 6/9] Fade in page title on scroll

---
 .../themes/wporg-developer-2023/parts/header-alt.html           | 2 +-
 .../themes/wporg-developer-2023/parts/header-third.html         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html b/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html
index 668cd7c3d..7c718930a 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header-alt.html
@@ -6,7 +6,7 @@
 	<div class="wp-block-group has-light-grey-1-color has-text-color">
 		<!-- wp:site-title {"level":0,"fontSize":"small","textColor":"white"} /-->
 
-		<!-- wp:wporg/page-title {"level":0,"fontSize":"small","fontFamily":"inter"} /-->
+		<!-- wp:wporg/page-title {"level":0,"fontSize":"small","fontFamily":"inter","className":"wporg-local-navigation-bar__fade-in-scroll"} /-->
 	</div>
 	<!-- /wp:group -->
 
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header-third.html b/source/wp-content/themes/wporg-developer-2023/parts/header-third.html
index 55b891393..8cd3a9a85 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header-third.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header-third.html
@@ -11,7 +11,7 @@
 	<div class="wp-block-group has-light-grey-1-color has-text-color">
 		<!-- wp:site-title {"level":0,"fontSize":"small","textColor":"white"} /-->
 
-		<!-- wp:wporg/page-title {"level":0,"fontSize":"small","fontFamily":"inter"} /-->
+		<!-- wp:wporg/page-title {"level":0,"fontSize":"small","fontFamily":"inter","className":"wporg-local-navigation-bar__fade-in-scroll"} /-->
 	</div>
 	<!-- /wp:group -->
 

From eab620d8348342f9b1a1cddfa3761745fb3a1509 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Fri, 16 Feb 2024 18:14:16 -0500
Subject: [PATCH 7/9] Fix spacing of Table of Contents sidebar

---
 source/wp-content/themes/wporg-developer-2023/theme.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/theme.json b/source/wp-content/themes/wporg-developer-2023/theme.json
index 098fb5caf..849eb4199 100644
--- a/source/wp-content/themes/wporg-developer-2023/theme.json
+++ b/source/wp-content/themes/wporg-developer-2023/theme.json
@@ -158,7 +158,7 @@
 			"wporg-sidebar-container": {
 				"spacing": {
 					"margin": {
-						"top": "150px"
+						"top": "100px"
 					}
 				}
 			},

From f35ac4a9fed665f0458d7a4bb29c87cde15c92de Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Fri, 16 Feb 2024 18:17:13 -0500
Subject: [PATCH 8/9] Update space over search box to match other pages

---
 .../themes/wporg-developer-2023/patterns/search-content.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/patterns/search-content.php b/source/wp-content/themes/wporg-developer-2023/patterns/search-content.php
index c015dba7d..63d5f3536 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/search-content.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/search-content.php
@@ -13,8 +13,8 @@
 	<!-- wp:group {"className":"align-left","layout":{"type":"constrained","contentSize":"","justifyContent":"left"},"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} -->
 	<div class="wp-block-group align-left" style="margin-bottom:var(--wp--preset--spacing--40)">
 
-		<!-- wp:group {"align":"wide","className":"wporg-search-controls","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"},"style":{"spacing":{"margin":{"top":"var:preset|spacing|10","bottom":"var:preset|spacing|20"}}}} -->
-		<div id="wporg-search" class="wp-block-group alignwide wporg-search-controls" style="margin-top:var(--wp--preset--spacing--10);margin-bottom:var(--wp--preset--spacing--20)">
+		<!-- wp:group {"align":"wide","className":"wporg-search-controls","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"},"style":{"spacing":{"margin":{"top":"var:preset|spacing|20","bottom":"var:preset|spacing|20"}}}} -->
+		<div id="wporg-search" class="wp-block-group alignwide wporg-search-controls" style="margin-top:var(--wp--preset--spacing--20);margin-bottom:var(--wp--preset--spacing--20)">
 	
 			<!-- wp:search {"label":"<?php esc_attr_e( 'Search', 'wporg' ); ?>","showLabel":false,"placeholder":"<?php esc_attr_e( 'Search resources', 'wporg' ); ?>","width":232,"widthUnit":"px","buttonText":"<?php esc_attr_e( 'Search', 'wporg' ); ?>","buttonPosition":"button-inside","buttonUseIcon":true,"className":"is-style-secondary-search-control wporg-filtered-search-form"} /-->
 

From eb5103535e4f9b420adeb8298e4da21bfc2eea45 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:54:47 -0500
Subject: [PATCH 9/9] Fix sidebar alignment on landing & inner handbook pages

---
 .../themes/wporg-developer-2023/src/style/style.scss          | 4 ++++
 source/wp-content/themes/wporg-developer-2023/theme.json      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
index fb84b6662..539b92cb2 100644
--- a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
+++ b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
@@ -3,6 +3,10 @@
  * templates or theme.json settings.
  */
 
+body.handbook-landing-page {
+	--wp--custom--wporg-sidebar-container--spacing--margin--top: 100px;
+}
+
 .wporg-breadcrumbs {
 	// If the breadcrumbs are present, the space after them needs to be reduced.
 	// The next content is typically the search field.
diff --git a/source/wp-content/themes/wporg-developer-2023/theme.json b/source/wp-content/themes/wporg-developer-2023/theme.json
index 849eb4199..098fb5caf 100644
--- a/source/wp-content/themes/wporg-developer-2023/theme.json
+++ b/source/wp-content/themes/wporg-developer-2023/theme.json
@@ -158,7 +158,7 @@
 			"wporg-sidebar-container": {
 				"spacing": {
 					"margin": {
-						"top": "100px"
+						"top": "150px"
 					}
 				}
 			},