Ticket #23558: 23558.5.diff

Index: wp-content/themes/twentythirteen/functions.php
===================================================================
--- wp-content/themes/twentythirteen/functions.php      (revision 23470)
+++ wp-content/themes/twentythirteen/functions.php      (working copy)
@@ -512,7 +512,26 @@
 }
 add_filter( 'body_class', 'twentythirteen_body_class' );
 
+
 /**
+ * Extends the default WordPress comment class to add 'no-avatars' class
+ * if avatars are disabled in discussion settings.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @param array $classes Existing class values.
+ * @return array Filtered class values.
+ */
+function twentythirteen_comment_class( $classes ) {
+       if ( ! get_option ( 'show_avatars' ) )
+               $classes[] = 'no-avatars';
+
+       return $classes;
+}
+add_filter( 'comment_class', 'twentythirteen_comment_class' );
+
+
+/**
  * Adjusts content_width value for image post formats, video post formats, and
  * image attachment templates.
  *
Index: wp-content/themes/twentythirteen/style.css
===================================================================
--- wp-content/themes/twentythirteen/style.css  (revision 23470)
+++ wp-content/themes/twentythirteen/style.css  (working copy)
@@ -2263,6 +2263,22 @@
        font-style: normal;
 }
 
+.no-avatars .comment-author {
+       float: none;
+       margin: 0 0 5px;
+       max-width: 100%;
+}
+
+.no-avatars .comment-author .fn {
+       line-height: 1.6;
+}
+
+.no-avatars .comment-meta,
+.no-avatars .comment-content,
+.no-avatars .reply {
+       width: 100%;
+}
+
 .bypostauthor .fn:before {
        content: '\f408';
 }