Skip to:
Content

BuddyPress.org

Changeset 4429


Ignore:
Timestamp:
05/26/2011 09:00:39 PM (14 years ago)
Author:
djpaul
Message:

Second pass at normalising activity stream and comment styles.
Don't generate an empty div; correct usage of comment_reply_link().
See #3242

Location:
trunk/bp-themes/bp-default
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-default/_inc/css/default.css

    r4427 r4429  
    11501150
    11511151ul.activity-list li {
    1152     padding: 10px 0 0;
     1152    padding: 15px 0 0;
    11531153    overflow: hidden;
    11541154}
     
    11601160}
    11611161ul.activity-list li.has-comments {
    1162     padding-bottom: 10px;
     1162    padding-bottom: 15px;
    11631163}
    11641164body.activity-permalink ul.activity-list li.has-comments {
     
    11691169    font-size: 11px;
    11701170    min-height: 35px;
    1171     padding: 12px 0 0 0;
     1171    padding: 15px 0 0 0;
    11721172}
    11731173.activity-list li.mini div.activity-meta {
     
    12721272    background: url( ../images/activity_arrow.gif ) top left no-repeat;
    12731273    margin-left: -35px;
    1274     padding: 5px 0 0 38px;
     1274    padding: 5px 0 0 35px;
    12751275    height: 35px;
    12761276    margin-bottom: 0;
     
    13341334body.activity-permalink .activity-content .activity-inner,
    13351335body.activity-permalink .activity-content blockquote {
     1336    margin-left: 0;
    13361337    margin-top: 5px;
    13371338}
     
    14591460}
    14601461body.activity-permalink div.activity-comments ul li > ul {
    1461     margin-top: 15px;
     1462    margin-top: 10px;
     1463}
     1464body.activity-permalink div.activity-comments > ul {
     1465    padding-left: 15px;
    14621466}
    14631467div.activity-comments div.acomment-avatar img {
     
    16801684div.post,
    16811685div.attachment {
    1682     margin: 0 0 40px 0;
     1686    margin: 0 0 30px 0;
    16831687    overflow: hidden;
    16841688}
     
    18481852    float: right;
    18491853}
    1850 div.page img,
    1851 div.post img {
    1852     margin-bottom: 15px;
    1853 }
    18541854img.wp-smiley {
    18551855    padding: 0 !important;
     
    18991899    font-size: 0.9em;
    19001900    line-height: 17px;
    1901     padding: 0 4px 5px 0;
     1901    padding: 5px 4px 5px 0;
    19021902    margin: 0;
    19031903}
     
    19091909    margin-left: 0;
    19101910}
     1911.gallery-item img {
     1912    margin-bottom: 15px;
     1913}
    19111914.gallery .gallery-caption {
    19121915    color: #555;
     
    19271930}
    19281931ol.commentlist li {
     1932    clear: left;
    19291933    list-style: none;
    1930     clear: left;
     1934    margin-bottom: 15px;
    19311935}
    19321936ol.commentlist div.comment-avatar-box {
    19331937    float: left;
    1934     margin: 10px 10px 10px 0;
     1938    margin: 15px 10px 15px 0;
    19351939}
    19361940.commentlist ul.children div.comment-avatar-box {
     
    19521956    color: #888;
    19531957    font-size: 11px;
    1954     margin: 10px 0;
     1958    margin: 15px 0;
    19551959}
    19561960div.comment-meta em {
     
    20632067    border: 1px solid #e5e5e5;
    20642068    border-radius: 4px;
    2065     padding: 10px;
     2069    padding: 15px;
    20662070    -moz-border-radius: 4px;
    20672071    -webkit-border-radius: 4px;
  • trunk/bp-themes/bp-default/functions.php

    r4422 r4429  
    441441                        &middot; <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
    442442                    <?php elseif ( comments_open() ) : ?>
    443                         &middot; <?php echo comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
     443                        &middot; <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
    444444                    <?php endif; ?>
    445445
     
    454454            <?php comment_text() ?>
    455455
    456             <?php if ( 1 == $depth && comments_open() ) : ?>
     456            <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
    457457                <div class="comment-options">
    458                     <?php echo comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
     458                    <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
    459459                </div>
    460460            <?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.