<!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][4705] trunk/bp-themes/bp-default: Update comment style to new activity stream look</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><a href="http://buddypress.trac.wordpress.org/changeset/4705">4705</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-07-18 21:17:15 +0000 (Mon, 18 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update comment style to new activity stream look</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="#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 (4704 => 4705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-18 20:05:29 UTC (rev 4704)
+++ trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-18 21:17:15 UTC (rev 4705)
</span><span class="lines">@@ -334,30 +334,9 @@
</span><span class="cx"> float: right;
</span><span class="cx"> margin: 0 0 0 10px;
</span><span class="cx"> }
</span><del>-.commentlist ul.children div.comment-options {
- margin-right: auto;
- margin-left: 0;
-}
</del><span class="cx"> #comments ol.commentlist ol {
</span><span class="cx"> margin: 0 2.5em 18px 0;
</span><span class="cx"> }
</span><del>-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;
-}
</del><span class="cx"> #reply-title small {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="lines">@@ -374,6 +353,11 @@
</span><span class="cx"> margin-right: 30px;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> }
</span><ins>+.comment-options .comment-reply-link,
+.comment-options .comment-edit-link {
+ margin-left: 5px;
+ margin-right: auto;
+}
</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 (4704 => 4705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-18 20:05:29 UTC (rev 4704)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-18 21:17:15 UTC (rev 4705)
</span><span class="lines">@@ -738,27 +738,15 @@
</span><span class="cx"> div.comment-content {
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>-.comment-entry {
- float: left;
-}
</del><span class="cx"> ul.children .comment-entry {
</span><span class="cx"> margin-bottom: 10px;
</span><span class="cx"> }
</span><span class="cx"> div.comment-meta {
</span><span class="cx"> color: #888;
</span><del>- float: left;
</del><span class="cx"> font-size: 11px;
</span><span class="cx"> margin: 15px 0;
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><del>-div.comment-meta p {
- float: left;
- margin-bottom: 0;
-}
-div.comment-meta .comment-options {
- float: right;
- margin-right: 10px;
-}
</del><span class="cx"> div.comment-meta em {
</span><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><span class="lines">@@ -795,9 +783,6 @@
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> margin: 0 0 10px 0;
</span><span class="cx"> }
</span><del>-.commentlist ul.children div.comment-options {
- margin-right: 0;
-}
</del><span class="cx"> .commentlist ul.children li {
</span><span class="cx"> border-top: 2px solid #fffeff;
</span><span class="cx"> padding-top: 10px;
</span><span class="lines">@@ -849,7 +834,20 @@
</span><span class="cx"> margin: 0 0 15px;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><ins>+.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;
+}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> /*--------------------------------------------------------------
</span><span class="cx"> 5.3 - Gallery
</span><span class="cx"> --------------------------------------------------------------*/
</span><span class="lines">@@ -1286,14 +1284,12 @@
</span><span class="cx"> padding: 4px 8px;
</span><span class="cx"> }
</span><span class="cx"> a.bp-primary-action,
</span><del>-.comment-reply-link,
</del><span class="cx"> #reply-title small a {
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> margin-right: 5px;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx"> a.bp-primary-action span,
</span><del>-.comment-reply-link span,
</del><span class="cx"> #reply-title small a span {
</span><span class="cx"> background: #999;
</span><span class="cx"> -moz-border-radius: 3px;
</span><span class="lines">@@ -1305,7 +1301,6 @@
</span><span class="cx"> padding: 0 5px;
</span><span class="cx"> }
</span><span class="cx"> a.bp-primary-action:hover span,
</span><del>-.comment-reply-link:hover span,
</del><span class="cx"> #reply-title small a:hover span {
</span><span class="cx"> background: #555;
</span><span class="cx"> color: #fff;
</span><span class="lines">@@ -1703,7 +1698,8 @@
</span><span class="cx"> input[type=button],
</span><span class="cx"> input[type=reset],
</span><span class="cx"> ul.button-nav li a,
</span><del>-div.generic-button a {
</del><ins>+div.generic-button a,
+.comment-reply-link {
</ins><span class="cx"> background: #fff;
</span><span class="cx"> background: -webkit-gradient(linear, left top, left bottom, from(white), to(#ededed));
</span><span class="cx"> background: -moz-linear-gradient(top, white, #ededed);
</span><span class="lines">@@ -1729,7 +1725,8 @@
</span><span class="cx"> input[type=reset]:hover,
</span><span class="cx"> ul.button-nav li a:hover,
</span><span class="cx"> ul.button-nav li.current a,
</span><del>-div.generic-button a:hover {
</del><ins>+div.generic-button a:hover,
+.comment-reply-link:hover {
</ins><span class="cx"> background: #ededed;
</span><span class="cx"> background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
</span><span class="cx"> background: -moz-linear-gradient(top, #fff, #e0e0e0);
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (4704 => 4705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2011-07-18 20:05:29 UTC (rev 4704)
+++ trunk/bp-themes/bp-default/functions.php 2011-07-18 21:17:15 UTC (rev 4705)
</span><span class="lines">@@ -433,19 +433,10 @@
</span><span class="cx"> <div class="comment-meta">
</span><span class="cx"> <p>
</span><span class="cx"> <?php
</span><del>- 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 );
</del><ins>+ /* 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() );
</ins><span class="cx"> ?>
</span><span class="cx"> </p>
</span><del>-
- <?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; ?>
</del><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="comment-entry">
</span><span class="lines">@@ -456,6 +447,17 @@
</span><span class="cx"> <?php comment_text() ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+ <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>
+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>