From a13dd31abc9aaa0e0e62484d46e167c282081747 Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 17:35:19 -0500
Subject: [PATCH 01/10] Fix navigation upsell RTL padding

---
 .../src/features/wpcom-site-menu/wpcom-site-menu.scss          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
index 942caec45e00d..4dc61f9a17661 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
@@ -59,8 +59,7 @@
 	}
 
 	.wp-menu-name {
-		padding-top: 0;
-		padding-left: 8px;
+		padding: 0 8px 8px 8px;
 	}
 
 	.upsell_banner {

From 8c5d6dc4a299563a6a03bddfde6a0eae93d878c4 Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 17:36:06 -0500
Subject: [PATCH 02/10] changelog

---
 .../jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding     | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding b/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding
new file mode 100644
index 0000000000000..2f170d47b98e0
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Fix navigation upsell RTL padding

From 64ec298a0654d7d9748907dfb236939c9e747d71 Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 17:49:47 -0500
Subject: [PATCH 03/10] Fix RTL notice close button

---
 .../src/features/wpcom-site-menu/wpcom-site-menu.php          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
index 04c93a3943992..87d8566743830 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
@@ -438,6 +438,10 @@ function wpcom_add_hosting_menu_intro_notice() {
 			height: 16px;
 			margin-left: auto;
 		}
+		.rtl .wpcom-site-menu-intro-notice a.close-button {
+			margin-left: 0;
+			margin-right: auto;
+		}
 	</style>
 	<div class="wpcom-site-menu-intro-notice notice notice-info" role="alert">
 		<div class="banner-icon">

From 918c440d4b528876174fad3462ce3d9b2ae092e2 Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 18:11:30 -0500
Subject: [PATCH 04/10] Try fix folded RTL

---
 .../src/features/wpcom-site-menu/wpcom-site-menu.scss        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
index 4dc61f9a17661..83acd8a84b34f 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
@@ -125,6 +125,11 @@
 		.wp-menu-name {
 			left: auto;
 			padding-left: 4px;
+
+			.rtl & {
+			 	right: auto;
+				padding-right: 4px;
+			}
 		}
 
 		.upsell_banner {

From cb18d85d4100425211ea65afa5e8f207bb938a66 Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 18:18:23 -0500
Subject: [PATCH 05/10] Try fix folded RTL

---
 .../features/wpcom-site-menu/wpcom-site-menu.scss  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
index 83acd8a84b34f..429b315cb1984 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
@@ -125,11 +125,6 @@
 		.wp-menu-name {
 			left: auto;
 			padding-left: 4px;
-
-			.rtl & {
-			 	right: auto;
-				padding-right: 4px;
-			}
 		}
 
 		.upsell_banner {
@@ -152,6 +147,15 @@
 	@include folded;
 }
 
+.rtl {
+	@include folded {
+		#adminmenu li.toplevel_page_site-notices .wp-menu-name {
+			right: auto;
+			padding-right: 4px;
+		}
+	}
+}
+
 @media only screen and (max-width: 960px) and (min-width: 783px) {
 	.auto-fold {
 		@include folded;

From f889a720a31156c5d8367fe4488929af2f695cdb Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 18:26:28 -0500
Subject: [PATCH 06/10] Try fix folded RTL

---
 .../src/features/wpcom-site-menu/wpcom-site-menu.scss           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
index 429b315cb1984..41920f4990a67 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
@@ -147,7 +147,7 @@
 	@include folded;
 }
 
-.rtl {
+.rtl .folded {
 	@include folded {
 		#adminmenu li.toplevel_page_site-notices .wp-menu-name {
 			right: auto;

From a8c17f41fd2a2b237104bd7d3513be57836c03fe Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 18:30:34 -0500
Subject: [PATCH 07/10] Try fix folded RTL

---
 .../src/features/wpcom-site-menu/wpcom-site-menu.scss  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
index 41920f4990a67..15dcbc7f0adc2 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
@@ -147,13 +147,9 @@
 	@include folded;
 }
 
-.rtl .folded {
-	@include folded {
-		#adminmenu li.toplevel_page_site-notices .wp-menu-name {
-			right: auto;
-			padding-right: 4px;
-		}
-	}
+.rtl .folded #adminmenu li.toplevel_page_site-notices .wp-menu-name {
+	right: auto;
+	padding-right: 4px;
 }
 
 @media only screen and (max-width: 960px) and (min-width: 783px) {

From 81c4ac1df3061984fcefd922efe48d06b888622e Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Mon, 29 Apr 2024 18:31:40 -0500
Subject: [PATCH 08/10] Try fix folded RTL

---
 .../src/features/wpcom-site-menu/wpcom-site-menu.scss           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
index 15dcbc7f0adc2..d1a4d725af852 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.scss
@@ -147,7 +147,7 @@
 	@include folded;
 }
 
-.rtl .folded #adminmenu li.toplevel_page_site-notices .wp-menu-name {
+.rtl.folded #adminmenu li.toplevel_page_site-notices .wp-menu-name {
 	right: auto;
 	padding-right: 4px;
 }

From cb607dea970ce8f5e0b72f21115c16e4e78e8c81 Mon Sep 17 00:00:00 2001
From: Dusty Reagan <dusty@dustyreagan.com>
Date: Tue, 30 Apr 2024 09:14:07 -0500
Subject: [PATCH 09/10] Update
 projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php

Co-authored-by: okmttdhr, tada <okmttdhr@users.noreply.github.com>
---
 .../src/features/wpcom-site-menu/wpcom-site-menu.php        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
index 87d8566743830..65b8ba565c9a9 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php
@@ -436,11 +436,7 @@ function wpcom_add_hosting_menu_intro_notice() {
 
 		.wpcom-site-menu-intro-notice a.close-button {
 			height: 16px;
-			margin-left: auto;
-		}
-		.rtl .wpcom-site-menu-intro-notice a.close-button {
-			margin-left: 0;
-			margin-right: auto;
+			margin-inline-start: auto;
 		}
 	</style>
 	<div class="wpcom-site-menu-intro-notice notice notice-info" role="alert">

From e68b259c5a35b10a5dce80600f48ad4a26d52328 Mon Sep 17 00:00:00 2001
From: DustyReagan <dusty@dustyreagan.com>
Date: Tue, 30 Apr 2024 09:16:57 -0500
Subject: [PATCH 10/10] Update changelog

---
 .../jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding b/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding
index 2f170d47b98e0..f3091d1c38df7 100644
--- a/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding
+++ b/projects/packages/jetpack-mu-wpcom/changelog/fix-nav-upsell-rtl-padding
@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Fix navigation upsell RTL padding
+Fix navigation upsell and notification RTL spacing.