From aa8b1838cd7fa94c8dd3ef0110df2d791fc13e62 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Mon, 28 Oct 2019 20:09:38 -0400
Subject: [PATCH] Pledge Form: Use agreement text as label content

This calls more attention to the agreement text, and correctly associates it with the input for screen reader users.
---
 .../views/inputs-pledge-new-misc.php          | 19 ++++++-------------
 .../wporg-5ftf/css/objects/_pledge-form.scss  |  5 +++++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php b/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php
index f21a031..4c0c19d 100644
--- a/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php
+++ b/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php
@@ -6,18 +6,6 @@ namespace WordPressDotOrg\FiveForTheFuture\View;
 ?>
 
 <div class="form-field form-field__agree">
-	<p>
-		<?php
-		printf(
-			wp_kses_post( '
-				I understand and agree to the <a href="%s">expectations</a> for
-				inclusion in the Five for the Future acknowledgement program.
-			' ),
-			esc_url( get_permalink( get_page_by_path( 'expectations' ) ) ) // TODO Change this URL?
-		);
-		?>
-	</p>
-
 	<input
 		type="checkbox"
 		id="5ftf-pledge-agreement"
@@ -26,6 +14,11 @@ namespace WordPressDotOrg\FiveForTheFuture\View;
 		<?php checked( $data['pledge-agreement'] ); ?>
 	/>
 	<label for="5ftf-pledge-agreement">
-		<?php esc_html_e( 'Yes', 'wordpressorg' ); ?>
+		<?php
+		printf(
+			wp_kses_post( __( 'I understand and agree to the <a href="%s">expectations</a> for inclusion in the Five for the Future acknowledgement program.', 'wporg-5ftf' ) ),
+			esc_url( get_permalink( get_page_by_path( 'expectations' ) ) ) // TODO Change this URL?
+		);
+		?>
 	</label>
 </div>
diff --git a/themes/wporg-5ftf/css/objects/_pledge-form.scss b/themes/wporg-5ftf/css/objects/_pledge-form.scss
index b37e86e..0083976 100644
--- a/themes/wporg-5ftf/css/objects/_pledge-form.scss
+++ b/themes/wporg-5ftf/css/objects/_pledge-form.scss
@@ -45,7 +45,12 @@
 
 	.form-field__agree {
 
+		input {
+			margin-top: 0;
+		}
+
 		label {
+			display: inline;
 			margin-bottom: 0;
 		}
 	}