Index: wp-content/themes/twentytwelve/style.css
===================================================================
--- wp-content/themes/twentytwelve/style.css	(revision 22098)
+++ wp-content/themes/twentytwelve/style.css	(working copy)
@@ -181,7 +181,7 @@
 .page-title,
 .widget-title,
 .entry-content th,
-.comment-content th {
+.comment-body th {
 	font-size: 11px;
 	font-size: 0.785714286rem;
 	line-height: 2.181818182;
@@ -280,7 +280,7 @@
 
 /* Responsive images */
 .entry-content img,
-.comment-content img,
+.comment-body img,
 .widget img {
 	max-width: 100%; /* Fluid images for posts, comments, and widgets */
 }
@@ -321,7 +321,7 @@
 	margin-right: auto;
 }
 .entry-content img,
-.comment-content img,
+.comment-body img,
 .widget img,
 img.header-image,
 .author-avatar img,
@@ -676,97 +676,97 @@
 	line-height: 1.714285714;
 }
 .entry-content h1,
-.comment-content h1,
+.comment-body h1,
 .entry-content h2,
-.comment-content h2,
+.comment-body h2,
 .entry-content h3,
-.comment-content h3,
+.comment-body h3,
 .entry-content h4,
-.comment-content h4,
+.comment-body h4,
 .entry-content h5,
-.comment-content h5,
+.comment-body h5,
 .entry-content h6,
-.comment-content h6 {
+.comment-body h6 {
 	margin: 24px 0;
 	margin: 1.714285714rem 0;
 	line-height: 1.714285714;
 }
 .entry-content h1,
-.comment-content h1 {
+.comment-body h1 {
 	font-size: 21px;
 	font-size: 1.5rem;
 	line-height: 1.5;
 }
 .entry-content h2,
-.comment-content h2 {
+.comment-body h2 {
 	font-size: 18px;
 	font-size: 1.285714286rem;
 	line-height: 1.6;
 }
 .entry-content h3,
-.comment-content h3 {
+.comment-body h3 {
 	font-size: 16px;
 	font-size: 1.142857143rem;
 	line-height: 1.846153846;
 }
 .entry-content h4,
-.comment-content h4 {
+.comment-body h4 {
 	font-size: 14px;
 	font-size: 1rem;
 	line-height: 1.846153846;
 }
 .entry-content h5,
-.comment-content h5 {
+.comment-body h5 {
 	font-size: 13px;
 	font-size: 0.928571429rem;
 	line-height: 1.846153846;
 }
 .entry-content h6,
-.comment-content h6 {
+.comment-body h6 {
 	font-size: 12px;
 	font-size: 0.857142857rem;
 	line-height: 1.846153846;
 }
 .entry-content p,
 .entry-summary p,
-.comment-content p {
+.comment-body p {
 	margin: 0 0 24px;
 	margin: 0 0 1.714285714rem;
 	line-height: 1.714285714;
 }
 .entry-content ol,
-.comment-content ol,
+.comment-body ol,
 .entry-content ul,
-.comment-content ul {
+.comment-body ul {
 	margin: 0 0 24px;
 	margin: 0 0 1.714285714rem;
 	line-height: 1.714285714;
 }
 .entry-content ul ul,
-.comment-content ul ul,
+.comment-body ul ul,
 .entry-content ol ol,
-.comment-content ol ol,
+.comment-body ol ol,
 .entry-content ul ol,
-.comment-content ul ol,
+.comment-body ul ol,
 .entry-content ol ul,
-.comment-content ol ul {
+.comment-body ol ul {
 	margin-bottom: 0;
 }
 .entry-content ul,
-.comment-content ul {
+.comment-body ul {
 	list-style: disc outside;
 }
 .entry-content ol,
-.comment-content ol {
+.comment-body ol {
 	list-style: decimal outside;
 }
 .entry-content li,
-.comment-content li {
+.comment-body li {
 	margin: 0 0 0 36px;
 	margin: 0 0 0 2.571428571rem;
 }
 .entry-content blockquote,
-.comment-content blockquote {
+.comment-body blockquote {
 	margin-bottom: 24px;
 	margin-bottom: 1.714285714rem;
 	padding: 24px;
@@ -774,18 +774,18 @@
 	font-style: italic;
 }
 .entry-content blockquote p:last-child,
-.comment-content blockquote p:last-child {
+.comment-body blockquote p:last-child {
 	margin-bottom: 0;
 }
 .entry-content code,
-.comment-content code {
+.comment-body code {
 	font-family: Consolas, Monaco, Lucida Console, monospace;
 	font-size: 12px;
 	font-size: 0.857142857rem;
 	line-height: 2;
 }
 .entry-content pre,
-.comment-content pre {
+.comment-body pre {
 	border: 1px solid #ededed;
 	color: #666;
 	font-family: Consolas, Monaco, Lucida Console, monospace;
@@ -799,20 +799,20 @@
 	padding: 1.714285714rem;
 }
 .entry-content pre code,
-.comment-content pre code {
+.comment-body pre code {
 	display: block;
 }
 .entry-content abbr,
-.comment-content abbr,
+.comment-body abbr,
 .entry-content dfn,
-.comment-content dfn,
+.comment-body dfn,
 .entry-content acronym,
-.comment-content acronym {
+.comment-body acronym {
 	border-bottom: 1px dotted #666;
 	cursor: help;
 }
 .entry-content address,
-.comment-content address {
+.comment-body address {
 	display: block;
 	line-height: 1.714285714;
 	margin: 0 0 24px;
@@ -840,23 +840,23 @@
 	margin-bottom: 1.714285714rem;
 }
 .entry-content dl,
-.comment-content dl {
+.comment-body dl {
 	margin: 0 24px;
 	margin: 0 1.714285714rem;
 }
 .entry-content dt,
-.comment-content dt {
+.comment-body dt {
 	font-weight: bold;
 	line-height: 1.714285714;
 }
 .entry-content dd,
-.comment-content dd {
+.comment-body dd {
 	line-height: 1.714285714;
 	margin-bottom: 24px;
 	margin-bottom: 1.714285714rem;
 }
 .entry-content table,
-.comment-content table {
+.comment-body table {
 	border-bottom: 1px solid #ededed;
 	color: #777;
 	font-size: 12px;
@@ -867,18 +867,19 @@
 	width: 100%;
 }
 .entry-content table caption,
-.comment-content table caption {
+.comment-body table caption {
 	font-size: 16px;
 	font-size: 1.142857143rem;
 	margin: 24px 0;
 	margin: 1.714285714rem 0;
 }
 .entry-content td,
-.comment-content td {
+.comment-body td {
 	border-top: 1px solid #ededed;
 	padding: 6px 10px 6px 0;
 }
-.site-content article {
+.site-content article,
+.commentlist .comment-body {
 	padding-bottom: 24px;
 	padding-bottom: 1.714285714rem;
 	margin-bottom: 72px;
@@ -1088,53 +1089,75 @@
 	line-height: 1.5;
 	font-weight: normal;
 }
-.comments-area article {
+.comments-area article,
+.commentlist .comment-body {
 	margin: 24px 0;
 	margin: 1.714285714rem 0;
 }
-.comments-area article header {
+.comment-meta {
 	margin: 0 0 48px;
 	margin: 0 0 3.428571429rem;
-	overflow: hidden;
 	position: relative;
 }
-.comments-area article header img {
+.pingback .comment-author,
+.trackback .comment-author,
+.pingback .commentmetadata,
+.trackback .commentmetadata,
+header.comment-author a.url,
+.commentmetadata .comment-edit-link {
+	display: inline;
+	margin: 0;
+}
+.comment-author img.avatar {
 	float: left;
 	padding: 0;
 	line-height: 0;
 }
-.comments-area article header cite,
-.comments-area article header time {
+.comment header.comment-author cite,
+header.comment-author a {
 	display: block;
 	margin-left: 85px;
 	margin-left: 6.071428571rem;
 }
-.comments-area article header cite {
+.comment .comment-author cite,
+.comment-meta a {
+	margin-left: 41px;
+	margin-left: 2.92857143;
+}
+.comment-author cite {
 	font-style: normal;
 	font-size: 15px;
 	font-size: 1.071428571rem;
 	line-height: 1.42857143;
 }
-.comments-area article header time {
+.comment-author time,
+.commentmetadata a {
 	line-height: 1.714285714;
 	text-decoration: none;
 	font-size: 12px;
 	font-size: 0.857142857rem;
 	color: #5e5e5e;
 }
-.comments-area article header a {
+.comment-author a,
+.comment-meta a {
 	text-decoration: none;
 	color: #5e5e5e;
 }
-.comments-area article header a:hover {
+.comment-author a:hover,
+.comment-meta a:hover {
 	color: #21759b;
 }
-.comments-area article header cite a {
+.comment-author cite a {
 	color: #444;
 }
-.comments-area article header cite a:hover {
+.comment-author a:hover {
 	text-decoration: underline;
 }
+.comment-author .says,
+.pingback .commentmetadata a:first-child,
+.trackback .commentmetadata a:first-child {
+	display: none;
+}
 .comments-area article header h4 {
 	position: absolute;
 	top: 0;
@@ -1155,7 +1178,7 @@
 	border-radius: 3px;
 	border: 1px solid #007cbd;
 }
-.comments-area li.bypostauthor cite span {
+li.bypostauthor cite span {
 	position: absolute;
 	margin-left: 5px;
 	margin-left: 0.357142857rem;
@@ -1164,6 +1187,9 @@
 	font-size: 10px;
 	font-size: 0.714285714rem;
 }
+.comment .reply {
+	clear: both;
+}
 a.comment-reply-link {
 	font-size: 13px;
 	font-size: 0.928571429rem;
@@ -1553,7 +1579,7 @@
 		text-decoration: none;
 	}
 	.entry-content img,
-	.comment-content img,
+	.comment-body img,
 	.author-avatar img,
 	img.wp-post-image {
 		border-radius: 0;
Index: wp-content/themes/twentytwelve/functions.php
===================================================================
--- wp-content/themes/twentytwelve/functions.php	(revision 22098)
+++ wp-content/themes/twentytwelve/functions.php	(working copy)
@@ -262,8 +262,10 @@
 		case 'trackback' :
 		// Display trackbacks differently than normal comments.
 	?>
-	<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
-		<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
+	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+		<article id="comment-<?php comment_ID(); ?>">
+			<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
+		</article>
 	<?php
 			break;
 		default :
@@ -271,15 +273,11 @@
 		global $post;
 	?>
 	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
-		<article id="comment-<?php comment_ID(); ?>" class="comment">
+		<article id="comment-<?php comment_ID(); ?>" class="comment-body">
 			<header class="comment-meta comment-author vcard">
 				<?php
 					echo get_avatar( $comment, 44 );
-					printf( '<cite class="fn">%1$s %2$s</cite>',
-						get_comment_author_link(),
-						// If current post author is also comment author, make it known visually.
-						( $comment->user_id === $post->post_author ) ? '<span> ' . __( 'Post author', 'twentytwelve' ) . '</span>' : ''
-					);
+					printf( '<cite class="fn">%1$s</cite>', get_comment_author_link() );
 					printf( '<a href="%1$s"><time pubdate datetime="%2$s">%3$s</time></a>',
 						esc_url( get_comment_link( $comment->comment_ID ) ),
 						get_comment_time( 'c' ),
@@ -308,6 +306,24 @@
 }
 endif;
 
+/**
+ * Adds a badge, if the current post author is also comment author.
+ *
+ * @param string $link The comment author link
+ * @return string
+ *
+ * @since Twenty Twelve 1.1
+ */
+function twentytwelve_bypostauthor( $link ) {
+	global $post, $comment;
+
+	if ( $comment->user_id === $post->post_author || true )
+		$link  .= '<span> ' . __( 'Post author', 'twentytwelve' ) . '</span>';
+
+	return $link;
+}
+add_filter( 'get_comment_author_link', 'twentytwelve_bypostauthor' );
+
 if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
 /**
  * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.