From d1e13712be71361c55fab7a7a2e209039c7cb81c Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 20:40:50 +0530
Subject: [PATCH 1/9] Fix navigation-link block to use button to default 40px
 size

---
 packages/block-library/src/navigation-link/link-ui.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation-link/link-ui.js b/packages/block-library/src/navigation-link/link-ui.js
index 1d303843644474..ee238c71ed28e0 100644
--- a/packages/block-library/src/navigation-link/link-ui.js
+++ b/packages/block-library/src/navigation-link/link-ui.js
@@ -310,8 +310,7 @@ const LinkUITools = ( { setAddingBlock, focusAddBlockButton } ) => {
 	return (
 		<VStack className="link-ui-tools">
 			<Button
-				// TODO: Switch to `true` (40px size) if possible
-				__next40pxDefaultSize={ false }
+				__next40pxDefaultSize
 				ref={ addBlockButtonRef }
 				icon={ plus }
 				onClick={ ( e ) => {

From d41604c998039a4f12baf0adcc20d02ccca6db22 Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 20:45:23 +0530
Subject: [PATCH 2/9] Fix navigation deleted create new menu button to use 40px
 default size

---
 .../src/navigation/edit/deleted-navigation-warning.js          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/deleted-navigation-warning.js b/packages/block-library/src/navigation/edit/deleted-navigation-warning.js
index 8950a700ace513..b0521f16cfb5d5 100644
--- a/packages/block-library/src/navigation/edit/deleted-navigation-warning.js
+++ b/packages/block-library/src/navigation/edit/deleted-navigation-warning.js
@@ -16,8 +16,7 @@ function DeletedNavigationWarning( { onCreateNew } ) {
 				{
 					button: (
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							__next40pxDefaultSize
 							onClick={ onCreateNew }
 							variant="link"
 						/>

From 6d2d3dfe36c30b4fbea27e003b83e052545795e5 Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 20:52:36 +0530
Subject: [PATCH 3/9] Fix navigation overlay menu icon button to use 40px
 default size

---
 packages/block-library/src/navigation/edit/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index c9ce17eea6b1ab..ae7dd60bd0c5ba 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -591,8 +591,7 @@ function Navigation( {
 						{ isResponsive && (
 							<>
 								<Button
-									// TODO: Switch to `true` (40px size) if possible
-									__next40pxDefaultSize={ false }
+									__next40pxDefaultSize
 									className={ overlayMenuPreviewClasses }
 									onClick={ () => {
 										setOverlayMenuPreview(

From 3edc766d224d0be9d46d76f4e2a86a3919a88719 Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 20:57:02 +0530
Subject: [PATCH 4/9] Fix the navigation menu delete button to use 40px default
 size button

---
 .../src/navigation/edit/navigation-menu-delete-control.js      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js b/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
index a75ad1dd00cce2..e95e07ab778c2f 100644
--- a/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
+++ b/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
@@ -19,8 +19,7 @@ export default function NavigationMenuDeleteControl( { onDelete } ) {
 	return (
 		<>
 			<Button
-				// TODO: Switch to `true` (40px size) if possible
-				__next40pxDefaultSize={ false }
+				__next40pxDefaultSize
 				className="wp-block-navigation-delete-menu-button"
 				variant="secondary"
 				isDestructive

From 338d4b3f44ce8f22b1053ebf2bc52f14de0648f0 Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 21:11:17 +0530
Subject: [PATCH 5/9] Fix navigation placeholder start empty to use button as
 default 40px size

---
 .../block-library/src/navigation/edit/placeholder/index.js     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/placeholder/index.js b/packages/block-library/src/navigation/edit/placeholder/index.js
index f4d01b73e1fbbd..7b989de1490afb 100644
--- a/packages/block-library/src/navigation/edit/placeholder/index.js
+++ b/packages/block-library/src/navigation/edit/placeholder/index.js
@@ -76,8 +76,7 @@ export default function NavigationPlaceholder( {
 
 						{ canUserCreateNavigationMenus && (
 							<Button
-								// TODO: Switch to `true` (40px size) if possible
-								__next40pxDefaultSize={ false }
+								__next40pxDefaultSize
 								variant="tertiary"
 								onClick={ onCreateEmpty }
 							>

From f0febe58dab12035fc658800a04a6aff9d62eafc Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 21:19:42 +0530
Subject: [PATCH 6/9] Fix responsive navigation overlay menu open button to use
 default 40px size

---
 .../block-library/src/navigation/edit/responsive-wrapper.js    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/responsive-wrapper.js b/packages/block-library/src/navigation/edit/responsive-wrapper.js
index 328152723026f5..c5bd6d1c165e01 100644
--- a/packages/block-library/src/navigation/edit/responsive-wrapper.js
+++ b/packages/block-library/src/navigation/edit/responsive-wrapper.js
@@ -79,8 +79,7 @@ export default function ResponsiveWrapper( {
 		<>
 			{ ! isOpen && (
 				<Button
-					// TODO: Switch to `true` (40px size) if possible
-					__next40pxDefaultSize={ false }
+					__next40pxDefaultSize
 					aria-haspopup="true"
 					aria-label={ hasIcon && __( 'Open menu' ) }
 					className={ openButtonClasses }

From 977b741c8d3ecb82b33a9d5c09eadb2a0b503aba Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Wed, 4 Sep 2024 21:23:24 +0530
Subject: [PATCH 7/9] Fix navigation responsive close button to use 40px
 default size

---
 .../block-library/src/navigation/edit/responsive-wrapper.js    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/responsive-wrapper.js b/packages/block-library/src/navigation/edit/responsive-wrapper.js
index c5bd6d1c165e01..886e808965ce4b 100644
--- a/packages/block-library/src/navigation/edit/responsive-wrapper.js
+++ b/packages/block-library/src/navigation/edit/responsive-wrapper.js
@@ -101,8 +101,7 @@ export default function ResponsiveWrapper( {
 				>
 					<div { ...dialogProps }>
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							__next40pxDefaultSize
 							className="wp-block-navigation__responsive-container-close"
 							aria-label={ hasIcon && __( 'Close menu' ) }
 							onClick={ () => onToggle( false ) }

From ecf4b99a90a59721a1fbce0e1a61f64cd9f12cc3 Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Fri, 6 Sep 2024 11:08:07 +0530
Subject: [PATCH 8/9] Add the !important to override the overlay menu preview
 style

Ref - https://github.com/WordPress/gutenberg/pull/65075#discussion_r1746282734
---
 packages/block-library/src/navigation/editor.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation/editor.scss b/packages/block-library/src/navigation/editor.scss
index a8d135656e44a1..980cced77b0858 100644
--- a/packages/block-library/src/navigation/editor.scss
+++ b/packages/block-library/src/navigation/editor.scss
@@ -563,7 +563,7 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 	width: 100%;
 	background-color: $gray-100;
 	padding: 0 $grid-unit-30;
-	height: $grid-unit-40 * 2;
+	height: $grid-unit-40 * 2 !important; // Adding !important to override default 40px size. Ref - https://github.com/WordPress/gutenberg/pull/65075#discussion_r1746282734
 	margin-bottom: $grid-unit-15;
 
 	&.open {

From 7c3d35c59513f1cfb666b473d3ae3fbfd3e290c1 Mon Sep 17 00:00:00 2001
From: hbhalodia <hit.bhalodia@rtcamp.com>
Date: Fri, 6 Sep 2024 11:10:43 +0530
Subject: [PATCH 9/9] Refactor the comment for the !important style

---
 packages/block-library/src/navigation/editor.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation/editor.scss b/packages/block-library/src/navigation/editor.scss
index 980cced77b0858..1d37186e4ae98b 100644
--- a/packages/block-library/src/navigation/editor.scss
+++ b/packages/block-library/src/navigation/editor.scss
@@ -563,7 +563,11 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 	width: 100%;
 	background-color: $gray-100;
 	padding: 0 $grid-unit-30;
-	height: $grid-unit-40 * 2 !important; // Adding !important to override default 40px size. Ref - https://github.com/WordPress/gutenberg/pull/65075#discussion_r1746282734
+
+	// Adding !important to override default 40px size.
+	// Ref - https://github.com/WordPress/gutenberg/pull/65075#discussion_r1746282734
+	height: $grid-unit-40 * 2 !important;
+
 	margin-bottom: $grid-unit-15;
 
 	&.open {