<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2429] trunk: Nav highlight fixes when on a single page.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2429</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-24 17:48:46 +0000 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nav highlight fixes when on a single page.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2428 => 2429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-24 17:31:42 UTC (rev 2428)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-24 17:48:46 UTC (rev 2429)
</span><span class="lines">@@ -1739,7 +1739,7 @@
</span><span class="cx"> if ( bp_is_blog_page() && is_front_page() && $bp->current_component != BP_HOME_BLOG_SLUG )
</span><span class="cx"> $bp_classes[] = 'home-page';
</span><span class="cx">
</span><del>- if ( bp_is_blog_page() || bp_is_register_page() || bp_is_activation_page() )
</del><ins>+ if ( ( bp_is_blog_page() || bp_is_register_page() || bp_is_activation_page() ) && !is_page() )
</ins><span class="cx"> $bp_classes[] = 'blog-page';
</span><span class="cx">
</span><span class="cx"> if ( !bp_is_blog_page() && !bp_is_register_page() && !bp_is_activation_page() )
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2428 => 2429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-24 17:31:42 UTC (rev 2428)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-24 17:48:46 UTC (rev 2429)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> left: 20px;
</span><span class="cx"> width: 44%;
</span><del>- margin: 0;
</del><ins>+ margin: 0 0 -5px 0;
</ins><span class="cx"> }
</span><span class="cx"> #header h1 a {
</span><span class="cx"> color: #fff;
</span><span class="lines">@@ -421,12 +421,12 @@
</span><span class="cx"> margin: 5px 0 0 5px;
</span><span class="cx"> }
</span><span class="cx"> div.item-list-tabs ul li:first-child {
</span><del>- margin-left: 25px;
</del><ins>+ margin-left: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.item-list-tabs ul li.last {
</span><span class="cx"> float: right;
</span><del>- margin: 7px 25px 0 0;
</del><ins>+ margin: 7px 20px 0 0;
</ins><span class="cx"> }
</span><span class="cx"> div.item-list-tabs ul li.last select {
</span><span class="cx"> max-width: 175px;
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> div.pagination {
</span><span class="cx"> margin: 0 -20px 9px -20px;
</span><span class="cx"> border-bottom: 1px solid #eaeaea;
</span><del>- padding: 10px 15px 10px 15px;
</del><ins>+ padding: 10px 20px 10px 20px;
</ins><span class="cx"> color: #888;
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> height: 16px;
</span><span class="lines">@@ -967,6 +967,10 @@
</span><span class="cx"> padding: 20px 0 0 0;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><ins>+ ul.activity-list li:first-child {
+ padding-top: 5px;
+ }
+
</ins><span class="cx"> ul.activity-list li.has-comments {
</span><span class="cx"> padding-bottom: 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -1487,7 +1491,7 @@
</span><span class="cx"> margin: 5px 0 0;
</span><span class="cx"> }
</span><span class="cx"> div.post h2.pagetitle a, div.post h2.posttitle a {
</span><del>- color: #555;
</del><ins>+ color: #666;
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (2428 => 2429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2010-01-24 17:31:42 UTC (rev 2428)
+++ trunk/bp-themes/bp-default/header.php 2010-01-24 17:48:46 UTC (rev 2429)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> <h1 id="logo"><a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</span><span class="cx">
</span><span class="cx"> <ul id="nav">
</span><del>- <li<?php if ( bp_is_page( 'home' ) ) : ?> class="selected"<?php endif; ?>>
</del><ins>+ <li<?php if ( bp_is_page( 'home' ) && !is_page() ) : ?> class="selected"<?php endif; ?>>
</ins><span class="cx"> <a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
</span><span class="cx"> </li>
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> <a href="<?php echo site_url() ?>/<?php echo BP_ACTIVITY_SLUG ?>/" title="<?php _e( 'Activity', 'buddypress' ) ?>"><?php _e( 'Activity', 'buddypress' ) ?></a>
</span><span class="cx"> </li>
</span><span class="cx"> <?php else : ?>
</span><del>- <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) || bp_is_blog_page() && !is_front_page() ) : ?> class="selected"<?php endif; ?>>
</del><ins>+ <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) || bp_is_blog_page() && !is_front_page() && !is_page() ) : ?> class="selected"<?php endif; ?>>
</ins><span class="cx"> <a href="<?php echo site_url() ?>/<?php echo BP_HOME_BLOG_SLUG ?>/" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a>
</span><span class="cx"> </li>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>