Changeset 4705

Timestamp:

07/18/2011 09:17:15 PM (14 years ago)

Author:

djpaul

Message:

Update comment style to new activity stream look

Location:

trunk/bp-themes/bp-default

Files:

• _inc/css/default-rtl.css (modified) (2 diffs)
• _inc/css/default.css (modified) (9 diffs)
• functions.php (modified) (2 diffs)

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

@@ -335 +335 @@
     margin: 0 0 0 10px;
 }
-.commentlist ul.children div.comment-options {
-    margin-right: auto;
-    margin-left: 0;
-}
 #comments ol.commentlist ol {
     margin: 0 2.5em 18px 0;
 }
-div.comment-meta {
-    float: right;
-}
-div.comment-meta em {
-    float: left;
-}
-div.comment-meta p {
-    float: right;
-}
-div.comment-meta .comment-options {
-    float: left;
-    margin-right: auto;
-    margin-left: 10px;
-}
-.comment-entry {
-    float: right;
-}
 #reply-title small {
     float: left;
@@ -374 +353 @@
     margin-right: 30px;
     margin-left: auto;
+}
+.comment-options .comment-reply-link,
+.comment-options .comment-edit-link {
+    margin-left: 5px;
+    margin-right: auto;
 }
 

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

@@ -739 +739 @@
     overflow: hidden;
 }
-.comment-entry {
-    float: left;
-}
 ul.children .comment-entry {
     margin-bottom: 10px;
@@ -747 +744 @@
 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 .comment-options {
-    float: right;
-    margin-right: 10px;
 }
 div.comment-meta em {
@@ -796 +784 @@
     margin: 0 0 10px 0;
 }
-.commentlist ul.children div.comment-options {
-    margin-right: 0;
-}
 .commentlist ul.children li {
     border-top: 2px solid #fffeff;
@@ -850 +835 @@
     padding: 0;
 }
+.comment-options {
+    margin: 10px 0 1px;
+}
+.comment-options .comment-reply-link,
+.comment-options .comment-edit-link {
+    font: normal 11px/20px Arial, Tahoma, Verdana, sans-serif;
+    margin-right: 5px;
+    padding: 4px 8px;
+}
+.commentlist ul.children div.comment-options {
+    margin-bottom: 10px;
+}
+
 
 /*--------------------------------------------------------------
@@ -1287 +1285 @@
 }
 a.bp-primary-action,
-.comment-reply-link,
 #reply-title small a {
     font-size: 11px;
@@ -1294 +1291 @@
 }
 a.bp-primary-action span,
-.comment-reply-link span,
 #reply-title small a span {
     background: #999;
@@ -1306 +1302 @@
 }
 a.bp-primary-action:hover span,
-.comment-reply-link:hover span,
 #reply-title small a:hover span {
     background: #555;
@@ -1704 +1699 @@
 input[type=reset],
 ul.button-nav li a,
-div.generic-button a {
+div.generic-button a,
+.comment-reply-link {
     background: #fff;
     background: -webkit-gradient(linear, left top, left bottom, from(white), to(#ededed));
@@ -1730 +1726 @@
 ul.button-nav li a:hover,
 ul.button-nav li.current a,
-div.generic-button a:hover {
+div.generic-button a:hover,
+.comment-reply-link:hover {
     background: #ededed;
     background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));

trunk/bp-themes/bp-default/functions.php

@@ -434 +434 @@
                 <p>
                     <?php
-                        if ( comments_open() )
-                            $links = get_comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) );
-                        else
-                            $links = '';
-
-                        /* translators: 1: comment author url, 2: comment author name, 3: comment permalink, 4: comment date/timestamp, 5: view/reply & edit comment links */
-                        printf( __( '<a href="%1$s" rel="nofollow">%2$s</a> said on <a href="%3$s"><span class="time-since">%4$s</span></a> %5$s', 'buddypress' ), get_comment_author_url(), get_comment_author(), get_comment_link(), get_comment_date(), $links );
+                        /* translators: 1: comment author url, 2: comment author name, 3: comment permalink, 4: comment date/timestamp*/
+                        printf( __( '<a href="%1$s" rel="nofollow">%2$s</a> said on <a href="%3$s"><span class="time-since">%4$s</span></a>', 'buddypress' ), get_comment_author_url(), get_comment_author(), get_comment_link(), get_comment_date() );
                     ?>
                 </p>
-
-                <?php if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) : ?>
-                    <div class="comment-options"><?php printf( '<a class="comment-edit-link bp-secondary-action" href="%1$s" title="%2$s">%3$s</a> ', get_edit_comment_link( $comment->comment_ID ), esc_attr__( 'Edit comment', 'buddypress' ), __( 'Edit', 'buddypress' ) ) ?></div>
-                <?php endif; ?>
             </div>
 
@@ -455 +446 @@
 
                 <?php comment_text() ?>
+            </div>
+
+            <div class="comment-options">
+                    <?php if ( comments_open() ) : ?>
+                        <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ); ?>
+                    <?php endif; ?>
+
+                    <?php if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) : ?>
+                        <?php printf( '<a class="button comment-edit-link bp-secondary-action" href="%1$s" title="%2$s">%3$s</a> ', get_edit_comment_link( $comment->comment_ID ), esc_attr__( 'Edit comment', 'buddypress' ), __( 'Edit', 'buddypress' ) ) ?>
+                    <?php endif; ?>
+
             </div>