From b0cae159ea2ebb9d94818f8c59008aede7a01082 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Fri, 5 Oct 2012 16:34:32 +0000
Subject: [PATCH] Put required field indicators within labels. Update styling
 of bundled themes to accommodate. Props MikeHansenMe. fixes #21897

git-svn-id: https://develop.svn.wordpress.org/trunk@22123 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-content/themes/twentyeleven/style.css | 1 -
 wp-content/themes/twentytwelve/style.css | 6 ------
 wp-includes/comment-template.php         | 4 ++--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/wp-content/themes/twentyeleven/style.css b/wp-content/themes/twentyeleven/style.css
index 20d55466e0..755919875b 100644
--- a/wp-content/themes/twentyeleven/style.css
+++ b/wp-content/themes/twentyeleven/style.css
@@ -2123,7 +2123,6 @@ a.comment-reply-link > span {
 	font-weight: bold;
 	left: 75%;
 	position: absolute;
-	top: 45px;
 	z-index: 1;
 }
 #respond .comment-notes,
diff --git a/wp-content/themes/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index de971e74f1..deb48373ac 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -1237,12 +1237,6 @@ a.comment-reply-link:hover {
 .required {
 	color: red;
 }
-label ~ span.required {
-	display: block;
-	float: left;
-	margin: -18px 0 0 -16px;
-	margin: -1.285714286rem 0 0 -1.142857143rem;
-}
 
 
 /* =Front page template
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 907bc77279..8be25e10d5 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1521,9 +1521,9 @@ function comment_form( $args = array(), $post_id = null ) {
 	$req = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
 	$fields =  array(
-		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) .
+		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>',
-		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) .
+		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 		            '<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
 		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' .
 		            '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',