Ticket #3242: 3242-01.patch

bp-themes/bp-default/functions.php

@@ -445 +445 @@
 
                                         <?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' ); ?>
                                 </p>
+
+                                <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
+                                        <p class="comment-reply"><?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?></p>
+                                <?php endif; ?>
                         </div>
 
-                        <?php if ( $comment->comment_approved == '0' ) : ?>
-                                <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?></em><br />
-                        <?php endif; ?>
+                        <div class="comment-entry">
+                                <?php if ( $comment->comment_approved == '0' ) : ?>
+                                        <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ); ?></em>
+                                <?php endif; ?>
 
-                        <?php comment_text() ?>
-
-                        <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
-                                <div class="comment-options">
-                                        <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
-                                </div>
-                        <?php endif; ?>
+                                <?php comment_text() ?>
+                        </div>
                 </div>
 <?php
 }

bp-themes/bp-default/_inc/css/default.css

@@ -1949 +1949 @@
         padding-left: 75px;
 }
 .commentlist .children .comment {
+        /* Is this needed? */
         margin-bottom: 5px;
 }
-div.comment-meta,
-div.comment-options {
+ul.children .comment-entry {
+        margin-bottom: 10px;
+}
+div.comment-meta {
         color: #888;
+        float: left; 
         font-size: 11px;
         margin: 15px 0;
+        width: 100%;
 }
+div.comment-meta p {
+        float: left;
+        margin-bottom: 0;
+}
+div.comment-meta p.comment-reply {
+        float: right;
+}
 div.comment-meta em {
         font-style: normal;
 }