<!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] [2711] trunk:
Load the admin bar styles separately from the default theme style.css.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2711</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-12 18:23:59 +0000 (Fri, 12 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Load the admin bar styles separately from the default theme style.css. This will ensure that the default theme admin bar styles are loaded if the active theme contains no styles for it. Themes can override these styles by adding an _inc/css/adminbar.css file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultstylecss">trunk/bp-themes/bp-default/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (2710 => 2711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php 2010-02-12 16:16:41 UTC (rev 2710)
+++ trunk/bp-core/bp-core-cssjs.php 2010-02-12 18:23:59 UTC (rev 2711)
</span><span class="lines">@@ -3,25 +3,22 @@
</span><span class="cx"> /**
</span><span class="cx"> * bp_core_add_admin_bar_css()
</span><span class="cx"> *
</span><del>- * Add the CSS needed for the admin bar on blogs (other than the root) and in the admin area.
</del><ins>+ * Add the CSS needed for the admin bar, regardless of the current theme.
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @uses get_option() Selects a site setting from the DB.
</del><span class="cx"> */
</span><span class="cx"> function bp_core_add_admin_bar_css() {
</span><del>- global $bp, $current_blog;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><span class="cx"> if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
- $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
</del><ins>+ $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
</ins><span class="cx">
</span><del>- if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', WP_CONTENT_URL . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) );
- else
- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ) );
- }
</del><ins>+ if ( file_exists( apply_filters( 'bp_core_add_admin_bar_css_location', WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) ) )
+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css_location', WP_CONTENT_URL . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) );
+ else
+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_default_admin_bar_css_location', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'bp_core_add_admin_bar_css' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultstylecss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/style.css (2710 => 2711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/style.css 2010-02-12 16:16:41 UTC (rev 2710)
+++ trunk/bp-themes/bp-default/style.css 2010-02-12 18:23:59 UTC (rev 2711)
</span><span class="lines">@@ -18,9 +18,4 @@
</span><span class="cx"> /***
</span><span class="cx"> * The default theme styles.
</span><span class="cx"> */
</span><del>-@import url( _inc/css/default.css );
-
-/***
- * The admin bar styles.
- */
-@import url( _inc/css/adminbar.css );
</del><span class="cx">\ No newline at end of file
</span><ins>+@import url( _inc/css/default.css );
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>