Ticket #3242: 3242-04.patch
File 3242-04.patch, 4.4 KB (added by , 14 years ago) |
---|
-
bp-themes/bp-default/_inc/css/default.css
700 700 list-style: none; 701 701 margin-bottom: 15px; 702 702 } 703 ol.commentlist ul.children li { 704 margin-bottom: 0; 705 } 703 706 ol.commentlist div.comment-avatar-box { 704 707 float: left; 705 margin: 15px 1 0px 15px0;708 margin: 15px 15px 0 0; 706 709 } 707 710 .commentlist ul.children div.comment-avatar-box { 708 711 float: left; 709 margin: 0px 10px 10px0;712 margin: 0px 10px 0 0; 710 713 } 711 714 div.comment-avatar-box img { 712 715 border: 2px solid #eee; 713 716 } 714 717 div.comment-content { 715 718 border-top: 1px solid #e4e4e4; 716 padding-left: 75px;719 overflow: hidden; 717 720 } 718 .comment list .children .comment{719 margin-bottom: 5px;721 .comment-entry { 722 float: left; 720 723 } 721 div.comment-meta, 722 div.comment-options { 724 ul.children .comment-entry { 725 margin-bottom: 10px; 726 } 727 div.comment-meta { 723 728 color: #888; 729 float: left; 724 730 font-size: 11px; 725 731 margin: 15px 0; 732 width: 100%; 726 733 } 734 div.comment-meta p { 735 float: left; 736 margin-bottom: 0; 737 } 738 div.comment-meta p.comment-reply { 739 float: right; 740 } 727 741 div.comment-meta em { 728 742 font-style: normal; 729 743 } … … 780 794 -moz-border-radius: 4px; 781 795 -webkit-border-radius: 4px; 782 796 border-radius: 4px; 783 margin-bottom: 10px; 784 margin-left: 75px; 785 padding: 1px 10px; 786 797 float: left; 798 margin: 15px 0 15px 70px; 799 padding: 0 10px; 787 800 } 788 801 .commentlist ul.children ul { 789 margin-left: 20px; 790 margin-bottom: 0; 791 padding: 5px 0 0 0; 802 margin: 0 0 0 25px; 792 803 } 793 804 .commentlist ul.children img.avatar { 794 805 border-style: none; … … 802 813 } 803 814 .commentlist ul.children div.comment-meta { 804 815 font-size: 11px; 805 margin -top:0;816 margin: 0 0 10px 0; 806 817 } 807 818 .commentlist ul.children div.comment-options { 808 819 margin-bottom: 5px; … … 843 854 margin-bottom: 0; 844 855 } 845 856 ol.commentlist #respond { 846 margin-left: 75px; 857 clear: left; 858 margin-left: 70px; 847 859 } 848 860 .commentlist ul.children #respond { 849 861 margin-bottom: 10px; … … 2266 2278 } 2267 2279 div#message-thread div.message-options { 2268 2280 text-align: right; 2269 } 2270 No newline at end of file 2281 } -
bp-themes/bp-default/functions.php
421 421 else 422 422 $avatar_size = 20; 423 423 ?> 424 424 425 <li <?php comment_class() ?> id="comment-<?php comment_ID() ?>"> 425 426 <div class="comment-avatar-box"> 426 427 <div class="avb"> … … 441 442 <span class="time-since"> <?php comment_date() ?></span> 442 443 443 444 <?php if ( 1 == $depth ) : ?> 444 ·<a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>445 <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a> 445 446 <?php elseif ( comments_open() ) : ?> 446 ·<?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>447 <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?> 447 448 <?php endif; ?> 448 449 449 <?php edit_comment_link( __( 'Edit', 'buddypress' ) , '· ', ''); ?>450 <?php edit_comment_link( __( 'Edit', 'buddypress' ) ); ?> 450 451 </p> 452 453 <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?> 454 <p class="comment-reply"><?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?></p> 455 <?php endif; ?> 451 456 </div> 452 457 453 <?php if ( $comment->comment_approved == '0' ) : ?> 454 <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?></em><br /> 455 <?php endif; ?> 458 <div class="comment-entry"> 459 <?php if ( $comment->comment_approved == '0' ) : ?> 460 <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ); ?></em> 461 <?php endif; ?> 456 462 457 <?php comment_text() ?> 463 <?php comment_text() ?> 464 </div> 458 465 459 <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>460 <div class="comment-options">461 <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>462 </div>463 <?php endif; ?>464 466 </div> 467 465 468 <?php 466 469 } 467 470 endif; … … 694 697 </div><!-- #<?php echo $nav_id; ?> --> 695 698 <?php endif; 696 699 } 697 ?> 698 No newline at end of file 700 ?>