From 243564abb2adbc96b5e732e6b416ac420b56601d Mon Sep 17 00:00:00 2001
From: Adam Wood <1017872+adamwoodnz@users.noreply.github.com>
Date: Thu, 29 Aug 2024 12:46:28 +1200
Subject: [PATCH] Theme: Use block attributes for Jetpack sub form styling
 where possible

See https://github.com/WordPress/Learn/issues/2828
---
 .../patterns/footer-content.php               |  2 +-
 .../wporg-learn-2024/src/style/_jetpack.scss  | 20 ++++++-------------
 .../pub/wporg-learn-2024/src/style/style.scss |  7 -------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/footer-content.php b/wp-content/themes/pub/wporg-learn-2024/patterns/footer-content.php
index 2a22eb513..fd046a49a 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/footer-content.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/footer-content.php
@@ -52,7 +52,7 @@
 			<p class="has-small-font-size"><?php esc_html_e( 'Get the latest news about everything Learn WordPress. Find out when new courses and lessons are available, and when registration opens for upcoming Online Workshops.', 'wporg-learn' ); ?></p>
 			<!-- /wp:paragraph -->
 
-			<!-- wp:jetpack/subscriptions {"className":"is-style-compact"} /-->
+			<!-- wp:jetpack/subscriptions {"borderRadius":2,"borderWeight":0,"className":"is-style-compact"} /-->
 
 		</div>
 		<!-- /wp:column -->
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/style/_jetpack.scss b/wp-content/themes/pub/wporg-learn-2024/src/style/_jetpack.scss
index a639fac06..aef805f92 100644
--- a/wp-content/themes/pub/wporg-learn-2024/src/style/_jetpack.scss
+++ b/wp-content/themes/pub/wporg-learn-2024/src/style/_jetpack.scss
@@ -1,19 +1,11 @@
+// Align the subscribed button to the left
 /* stylelint-disable-next-line max-line-length */
-.wp-block-jetpack-subscriptions.wp-block-jetpack-subscriptions__supports-newline:not(.wp-block-jetpack-subscriptions__use-newline) {
-	#subscribe-email input {
-		border-top-left-radius: 2px !important;
-		border-bottom-left-radius: 2px !important;
-	}
-
-	p#subscribe-submit {
-		justify-content: start;
+.wp-block-jetpack-subscriptions.wp-block-jetpack-subscriptions__supports-newline:not(.wp-block-jetpack-subscriptions__use-newline) p#subscribe-submit {
+	justify-content: flex-start;
+}
 
-		button {
-			border-top-right-radius: 2px !important;
-			border-bottom-right-radius: 2px !important;
-			font-weight: 600;
-		}
-	}
+.wp-block-jetpack-subscriptions .wp-block-button__link {
+	font-weight: 600;
 }
 
 .wp-block-jetpack-contact-form-container .contact-form {
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 693ebcb0e..ea6a0d054 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
@@ -37,13 +37,6 @@ body {
 }
 
 .wporg-learn-footer-signup {
-	input[type="email"] {
-		border-color: var(--wp--custom--form--color--background);
-	}
-
-	button[type="submit"] {
-		font-weight: 400;
-	}
 
 	@media screen and (max-width: 781px) {
 		border-left: none;