<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4577] trunk/bp-themes/bp-default: First pass at tidying up comment styling.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4577</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-06-30 20:33:09 +0000 (Thu, 30 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at tidying up comment styling. See #3242. Big props Dennissmolek & hnla</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultrtlcss">trunk/bp-themes/bp-default/_inc/css/default-rtl.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultcommentsphp">trunk/bp-themes/bp-default/comments.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default-rtl.css (4576 => 4577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-06-29 20:31:01 UTC (rev 4576)
+++ trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-06-30 20:33:09 UTC (rev 4577)
</span><span class="lines">@@ -196,6 +196,10 @@
</span><span class="cx"> margin: 0 0 15px 15px;
</span><span class="cx"> font-family: sans-serif;
</span><span class="cx"> }
</span><ins>+#respond .comment-avatar-box {
+ float: right;
+ margin: 0 0 0 15px;
+}
</ins><span class="cx"> div.post-content,
</span><span class="cx"> div.comment-content {
</span><span class="cx"> margin-right: 105px;
</span><span class="lines">@@ -308,9 +312,29 @@
</span><span class="cx"> .comments {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><ins>+.commentlist ul.children {
+ margin: 15px 70px 15px 0;
+}
+.commentlist ul.children ul {
+ margin: 0 25px 0 0 0;
+}
+ol.commentlist #respond {
+ clear: right;
+ margin-left: auto;
+ margin-right: 70px;
+}
+div.comment-meta {
+ float: right;
+}
</ins><span class="cx"> div.comment-meta em {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><ins>+div.comment-meta p {
+ float: right;
+}
+div.comment-meta p.comment-reply {
+ float: left;
+}
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*--------------------------------------------------------------
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4576 => 4577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-06-29 20:31:01 UTC (rev 4576)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-06-30 20:33:09 UTC (rev 4577)
</span><span class="lines">@@ -696,34 +696,48 @@
</span><span class="cx"> margin: 0 0 30px 0;
</span><span class="cx"> }
</span><span class="cx"> ol.commentlist li {
</span><ins>+ border-top: 1px solid #e4e4e4;
</ins><span class="cx"> clear: left;
</span><span class="cx"> list-style: none;
</span><span class="cx"> margin-bottom: 15px;
</span><span class="cx"> }
</span><ins>+ol.commentlist ul.children li {
+ margin-bottom: 0;
+}
</ins><span class="cx"> ol.commentlist div.comment-avatar-box {
</span><span class="cx"> float: left;
</span><del>- margin: 15px 10px 15px 0;
</del><ins>+ margin: 15px 15px 0 0;
</ins><span class="cx"> }
</span><span class="cx"> .commentlist ul.children div.comment-avatar-box {
</span><span class="cx"> float: left;
</span><del>- margin: 0px 10px 10px 0;
</del><ins>+ margin: 0px 10px 0 0;
</ins><span class="cx"> }
</span><span class="cx"> div.comment-avatar-box img {
</span><span class="cx"> border: 2px solid #eee;
</span><span class="cx"> }
</span><span class="cx"> div.comment-content {
</span><del>- border-top: 1px solid #e4e4e4;
- padding-left: 75px;
</del><ins>+ overflow: hidden;
</ins><span class="cx"> }
</span><del>-.commentlist .children .comment {
- margin-bottom: 5px;
</del><ins>+.comment-entry {
+ float: left;
</ins><span class="cx"> }
</span><del>-div.comment-meta,
-div.comment-options {
</del><ins>+ul.children .comment-entry {
+ margin-bottom: 10px;
+}
+div.comment-meta {
</ins><span class="cx"> color: #888;
</span><ins>+ float: left;
</ins><span class="cx"> font-size: 11px;
</span><span class="cx"> margin: 15px 0;
</span><ins>+ width: 100%;
</ins><span class="cx"> }
</span><ins>+div.comment-meta p {
+ float: left;
+ margin-bottom: 0;
+}
+div.comment-meta p.comment-reply {
+ float: right;
+}
</ins><span class="cx"> div.comment-meta em {
</span><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><span class="lines">@@ -780,15 +794,11 @@
</span><span class="cx"> -moz-border-radius: 4px;
</span><span class="cx"> -webkit-border-radius: 4px;
</span><span class="cx"> border-radius: 4px;
</span><del>- margin-bottom: 10px;
- margin-left: 75px;
- padding: 1px 10px;
-
</del><ins>+ margin: 15px 0 15px 70px;
+ padding: 0 10px;
</ins><span class="cx"> }
</span><span class="cx"> .commentlist ul.children ul {
</span><del>- margin-left: 20px;
- margin-bottom: 0;
- padding: 5px 0 0 0;
</del><ins>+ margin: 0 0 0 25px;
</ins><span class="cx"> }
</span><span class="cx"> .commentlist ul.children img.avatar {
</span><span class="cx"> border-style: none;
</span><span class="lines">@@ -796,13 +806,9 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> width: 25px;
</span><span class="cx"> }
</span><del>-.commentlist ul.children div.comment-content {
- border-top: none;
- padding-left: 35px;
-}
</del><span class="cx"> .commentlist ul.children div.comment-meta {
</span><span class="cx"> font-size: 11px;
</span><del>- margin-top: 0;
</del><ins>+ margin: 0 0 10px 0;
</ins><span class="cx"> }
</span><span class="cx"> .commentlist ul.children div.comment-options {
</span><span class="cx"> margin-bottom: 5px;
</span><span class="lines">@@ -839,11 +845,19 @@
</span><span class="cx"> border-radius: 4px;
</span><span class="cx"> padding: 15px;
</span><span class="cx"> }
</span><ins>+#respond .avb img {
+ float: inherit;
+}
+#respond .comment-avatar-box {
+ float: left;
+ margin: 0 15px 0 0;
+}
</ins><span class="cx"> #respond .form-submit {
</span><span class="cx"> margin-bottom: 0;
</span><span class="cx"> }
</span><span class="cx"> ol.commentlist #respond {
</span><del>- margin-left: 75px;
</del><ins>+ clear: left;
+ margin-left: 70px;
</ins><span class="cx"> }
</span><span class="cx"> .commentlist ul.children #respond {
</span><span class="cx"> margin-bottom: 10px;
</span><span class="lines">@@ -853,9 +867,6 @@
</span><span class="cx"> h3#reply .comments-header {
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> }
</span><del>-#respond div.comment-avatar-box {
- margin-top: 0;
-}
</del><span class="cx"> #respond div.comment-content {
</span><span class="cx"> border-style: none;
</span><span class="cx"> }
</span><span class="lines">@@ -1649,7 +1660,6 @@
</span><span class="cx"> .standard-form#sidebar-login-form label {
</span><span class="cx"> margin-top: 5px;
</span><span class="cx"> }
</span><del>-.form-allowed-tags,
</del><span class="cx"> .standard-form input[type=text] {
</span><span class="cx"> width: 75%;
</span><span class="cx"> }
</span><span class="lines">@@ -1663,7 +1673,10 @@
</span><span class="cx"> width: 35%;
</span><span class="cx"> }
</span><span class="cx"> .standard-form#signup_form input[type=text],
</span><del>-.standard-form#signup_form textarea {
</del><ins>+.standard-form#signup_form textarea,
+.form-allowed-tags,
+#commentform input[type=text],
+#commentform textarea {
</ins><span class="cx"> width: 90%;
</span><span class="cx"> }
</span><span class="cx"> .standard-form#signup_form div.submit {
</span><span class="lines">@@ -2266,4 +2279,4 @@
</span><span class="cx"> }
</span><span class="cx"> div#message-thread div.message-options {
</span><span class="cx"> text-align: right;
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/comments.php (4576 => 4577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/comments.php 2011-06-29 20:31:01 UTC (rev 4576)
+++ trunk/bp-themes/bp-default/comments.php 2011-06-30 20:33:09 UTC (rev 4577)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> <?php do_action( 'bp_before_blog_comment_list' ) ?>
</span><span class="cx">
</span><span class="cx"> <ol class="commentlist">
</span><del>- <?php wp_list_comments( array( 'callback' => 'bp_dtheme_blog_comments' ) ) ?>
</del><ins>+ <?php wp_list_comments( array( 'callback' => 'bp_dtheme_blog_comments', 'type' => 'comment' ) ) ?>
</ins><span class="cx"> </ol><!-- .comment-list -->
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_blog_comment_list' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (4576 => 4577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2011-06-29 20:31:01 UTC (rev 4576)
+++ trunk/bp-themes/bp-default/functions.php 2011-06-30 20:33:09 UTC (rev 4577)
</span><span class="lines">@@ -421,6 +421,7 @@
</span><span class="cx"> else
</span><span class="cx"> $avatar_size = 20;
</span><span class="cx"> ?>
</span><ins>+
</ins><span class="cx"> <li <?php comment_class() ?> id="comment-<?php comment_ID() ?>">
</span><span class="cx"> <div class="comment-avatar-box">
</span><span class="cx"> <div class="avb">
</span><span class="lines">@@ -441,27 +442,29 @@
</span><span class="cx"> <span class="time-since">&nbsp; <?php comment_date() ?></span>
</span><span class="cx">
</span><span class="cx"> <?php if ( 1 == $depth ) : ?>
</span><del>- &middot; <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
</del><ins>+ <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
</ins><span class="cx"> <?php elseif ( comments_open() ) : ?>
</span><del>- &middot; <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
</del><ins>+ <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' ); ?>
</del><ins>+ <?php edit_comment_link( __( 'Edit', 'buddypress' ) ); ?>
</ins><span class="cx"> </p>
</span><ins>+
+ <?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; ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( $comment->comment_approved == '0' ) : ?>
- <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?></em><br />
- <?php endif; ?>
</del><ins>+ <div class="comment-entry">
+ <?php if ( $comment->comment_approved == '0' ) : ?>
+ <em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ); ?></em>
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php comment_text() ?>
</del><ins>+ <?php comment_text() ?>
+ </div>
</ins><span class="cx">
</span><del>- <?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; ?>
</del><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="lines">@@ -694,4 +697,4 @@
</span><span class="cx"> </div><!-- #<?php echo $nav_id; ?> -->
</span><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>