From 6085a4c41fca1be058446576e431e6bfe4d42e07 Mon Sep 17 00:00:00 2001
From: Adam Wood <1017872+adamwoodnz@users.noreply.github.com>
Date: Fri, 10 Nov 2023 10:05:54 +1300
Subject: [PATCH] Revert "Revert "Update header behaviour"" (#348)

Revert "Revert "Update header behaviour" (#347)"

This reverts commit f2a0a522973f90645d36e566a3de480cddc901ee.
---
 .../parts/header-no-breadcrumbs.html          | 10 +--
 .../wporg-developer-2023/parts/header.html    | 18 ++---
 .../wporg-developer-2023/parts/local-nav.html |  2 +-
 .../patterns/front-page-header.php            | 70 +++++++++++--------
 .../templates/front-page.html                 |  2 +-
 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html b/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html
index 4e9ba37a1..dc76746ef 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header-no-breadcrumbs.html
@@ -1,9 +1,3 @@
-<!-- wp:wporg/global-header /-->
+<!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->
 
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"backgroundColor":"charcoal-2","className":"is-sticky","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull is-sticky has-charcoal-2-background-color has-background">
-
-	<!-- wp:template-part {"slug":"local-nav","className":"has-display-contents"} /-->
-
-</div>
-<!-- /wp:group -->
+<!-- wp:template-part {"slug":"local-nav","className":"has-display-contents"} /-->
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 98656fde6..8b5237e5b 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/header.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/header.html
@@ -1,17 +1,11 @@
-<!-- wp:wporg/global-header /-->
+<!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->
 
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"backgroundColor":"charcoal-2","className":"is-sticky","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull is-sticky has-charcoal-2-background-color has-background">
+<!-- wp:template-part {"slug":"local-nav","className":"has-display-contents"} /-->
 
-	<!-- wp:template-part {"slug":"local-nav","className":"has-display-contents"} /-->
-
-	<!-- wp:group {"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="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:group {"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="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 -->
diff --git a/source/wp-content/themes/wporg-developer-2023/parts/local-nav.html b/source/wp-content/themes/wporg-developer-2023/parts/local-nav.html
index dbad1d538..de9842733 100644
--- a/source/wp-content/themes/wporg-developer-2023/parts/local-nav.html
+++ b/source/wp-content/themes/wporg-developer-2023/parts/local-nav.html
@@ -1,4 +1,4 @@
-<!-- wp:wporg/local-navigation-bar {"backgroundColor":"charcoal-2","style":{"spacing":{"padding":{"right":"var:preset|spacing|60","left":"var:preset|spacing|60","top":"18px","bottom":"18px"}},"position":{"type":"sticky"},"border":{"top":{"color":"var:preset|color|white-opacity-15","width":"1px"}}}} -->
+<!-- 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:site-title {"level":0,"fontSize":"small"} /-->
 
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 bf8bb7106..3b065ac2f 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
@@ -7,37 +7,49 @@
 
 ?>
 
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"0"}},"backgroundColor":"charcoal-2","className":"is-sticky","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull is-sticky has-charcoal-2-background-color has-background"><!-- wp:wporg/local-navigation-bar {"backgroundColor":"charcoal-2","style":{"spacing":{"padding":{"right":"var:preset|spacing|60","left":"var:preset|spacing|60","top":"18px","bottom":"18px"}},"position":{"type":"sticky"},"border":{"top":{"color":"var:preset|color|white-opacity-15","width":"1px"}}}} -->
-<!-- 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:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"developer"} /-->
-<!-- /wp:wporg/local-navigation-bar --></div>
-<!-- /wp:group -->
+<!-- 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:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"developer"} /-->
+
+<!-- /wp:wporg/local-navigation-bar -->
 
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}},"backgroundColor":"charcoal-2","className":"has-white-color has-charcoal-2-background-color has-text-color has-background has-link-color","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-white-color has-charcoal-2-background-color has-text-color has-background has-link-color" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"wrap","verticalAlignment":"bottom"}} -->
-<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:heading {"level":1,"style":{"typography":{"fontSize":"50px","fontStyle":"normal","fontWeight":"400"}},"fontFamily":"eb-garamond"} -->
-<h1 class="wp-block-heading has-eb-garamond-font-family" style="font-size:50px;font-style:normal;font-weight:400"><?php esc_html_e( 'Developer Resources', 'wporg' ); ?></h1>
-<!-- /wp:heading -->
-
-<!-- wp:paragraph {"style":{"typography":{"lineHeight":"2.3"}},"textColor":"white"} -->
-<p class="has-white-color has-text-color" style="line-height:2.3"><?php esc_html_e( '/The freedom to build', 'wporg' ); ?></p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group --></div>
+<div class="wp-block-group alignfull has-white-color has-charcoal-2-background-color has-text-color has-background has-link-color" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
+
+	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"wrap","verticalAlignment":"bottom"}} -->
+	<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)">
+	
+		<!-- wp:heading {"level":1,"style":{"typography":{"fontSize":"50px","fontStyle":"normal","fontWeight":"400"}},"fontFamily":"eb-garamond"} -->
+		<h1 class="wp-block-heading has-eb-garamond-font-family" style="font-size:50px;font-style:normal;font-weight:400"><?php esc_html_e( 'Developer Resources', 'wporg' ); ?></h1>
+		<!-- /wp:heading -->
+
+		<!-- wp:paragraph {"style":{"typography":{"lineHeight":"2.3"}},"textColor":"white"} -->
+		<p class="has-white-color has-text-color" style="line-height:2.3"><?php esc_html_e( '/The freedom to build', 'wporg' ); ?></p>
+		<!-- /wp:paragraph -->
+	
+	</div>
+	<!-- /wp:group -->
+
+</div>
 <!-- /wp:group -->
 
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|10","bottom":"var:preset|spacing|10"}}},"backgroundColor":"lemon-3","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-lemon-3-background-color has-background" style="padding-top:var(--wp--preset--spacing--10);padding-bottom:var(--wp--preset--spacing--10)"><!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
-<p class="has-text-align-center has-extra-small-font-size"><?php echo wp_kses_post(
-	sprintf(
-	/* translators: %1$s: version link, %2$s: version number */
-		__( 'See <a href="%1$s">what has changed</a> in the WordPress %2$s API.', 'wporg' ),
-		'[wordpress_version_link]',
-		'[wordpress_version]'
-	)
-); ?></p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->
\ No newline at end of file
+<div class="wp-block-group alignfull has-lemon-3-background-color has-background" style="padding-top:var(--wp--preset--spacing--10);padding-bottom:var(--wp--preset--spacing--10)">
+
+	<!-- wp:paragraph {"align":"center","fontSize":"extra-small"} -->
+	<p class="has-text-align-center has-extra-small-font-size"><?php echo wp_kses_post(
+		sprintf(
+		/* translators: %1$s: version link, %2$s: version number */
+			__( 'See <a href="%1$s">what has changed</a> in the WordPress %2$s API.', 'wporg' ),
+			'[wordpress_version_link]',
+			'[wordpress_version]'
+		)
+	); ?></p>
+	<!-- /wp:paragraph -->
+
+</div>
+<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/front-page.html b/source/wp-content/themes/wporg-developer-2023/templates/front-page.html
index b4f31271e..f512a7aaf 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/front-page.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/front-page.html
@@ -1,4 +1,4 @@
-<!-- wp:wporg/global-header /-->
+<!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->
 
 <!-- wp:pattern {"slug":"wporg-developer-2023/front-page-header"} /-->