Changeset 4436

Timestamp:

05/28/2011 11:43:37 PM (15 years ago)

Author:

djpaul

Message:

Move buddybar CSS out of BP-Default.
Maintain backpat for any child theme customisations. Add minified versions.

Location:

trunk

Files:

• bp-core/bp-core-buddybar.php (modified) (3 diffs)
• bp-core/css/buddybar-rtl.css (added)
• bp-core/css/buddybar-rtl.dev.css (added)
• bp-core/css/buddybar.css (added)
• bp-core/css/buddybar.dev.css (moved) (moved from trunk/bp-themes/bp-default/_inc/css/adminbar.css )
• bp-core/images/60pc_black.png (copied) (copied from trunk/bp-themes/bp-default/_inc/images/60pc_black.png )
• bp-core/images/admin-menu-arrow.gif (copied) (copied from trunk/bp-themes/bp-default/_inc/images/admin-menu-arrow.gif )
• bp-themes/bp-default/rtl.css (modified) (2 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -471 +471 @@
  * Handle the Admin Bar/BuddyBar business
  *
+ * @global num $wp_version
  * @todo Clean up global constants
- *
- * @global num $wp_version
  */
 function bp_core_load_admin_bar() {
@@ -492 +491 @@
 
                 // Admin bar styles
-                $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
-
-                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' ), array(), BP_VERSION );
-                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' ), array(), BP_VERSION );
+                if ( file_exists( get_stylesheet_directory() . '/_inc/css/adminbar.css' ) ) // Backwards compatibility
+                        $stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
+                elseif ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
+                        $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.dev.css';
+                else
+                        $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.css';
+
+                wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array(), BP_VERSION );
 
                 // Actions used to build the BP admin bar
@@ -512 +513 @@
 }
 
+/**
+ * Load the buddybar's RTL stylesheet if appropriate.
+ *
+ * This can't be done in bp_core_load_admin_bar() because that function is called before locale.php is included.
+ *
+ * @since 1.3
+ */
+function bp_core_load_buddybar_rtl_stylesheet() {
+        if ( !is_rtl() )
+                return;
+
+        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
+                $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar-rtl.dev.css';
+        else
+                $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar-rtl.css';
+
+        wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), BP_VERSION );
+}
+add_action( 'wp', 'bp_core_load_buddybar_rtl_stylesheet' );
 ?>

trunk/bp-themes/bp-default/rtl.css

@@ -667 +667 @@
 /* > Footer
 -------------------------------------------------------------- */
+
 #footer-widget-area div.widget-area > ul {
         float: right;
@@ -676 +677 @@
         margin-left: 0;
 }
-
-
-/* > Admin bar styles
--------------------------------------------------------------- */
-
-#wp-admin-bar {
-        right: 0;
-        left: auto;
-}
-#wp-admin-bar div#admin-bar-logo {
-        right: 10px;
-        left: auto;
-}
-#wp-admin-bar li {
-        text-align: right;
-}
-#wp-admin-bar li.no-arrow a {
-        padding-left: 15px;
-        padding-right: 0;
-}
-#admin-bar-logo {
-        float: right;
-}
-
-#wp-admin-bar ul li {/* all list items */
-        float: right;
-        background: url( _inc/images/admin-menu-arrow.gif ) 12% 53% no-repeat;
-        padding-left: 11px;
-        padding-right: 0;
-}
-#wp-admin-bar ul li.no-arrow {
-        padding-left: 0;
-}
-#wp-admin-bar ul li.align-right {
-        left: 0;
-        right: auto;
-}
-
-/* second-level lists */
-#wp-admin-bar ul li ul {
-        right: -999em;
-        left: auto;
-        margin-right: 0;
-}
-#wp-admin-bar ul li ul li {
-        float: right;
-}
-
-/* third-and-above-level lists */
-#wp-admin-bar ul li ul ul {
-        margin: -25px 184px 0 0;
-}
-#wp-admin-bar ul li:hover ul,
-#wp-admin-bar ul li li:hover ul,
-#wp-admin-bar ul li.sfhover ul,
-#wp-admin-bar ul li ul li.sfhover ul {/* lists nested under hovered list items */
-        right: auto;
-}
-#wp-admin-bar ul li.align-right:hover ul {
-        left: 0;
-        right: auto;
-}
-#wp-admin-bar ul li:hover ul ul,
-#wp-admin-bar li.sfhover ul li ul {
-        right: -999em;
-        left: auto;
-}
-
-/* Menu item css */
-#wp-admin-bar img.avatar {
-        float: right;
-        margin-left: 8px;
-        margin-right: 0;
-}
-#wp-admin-bar span.activity {
-        margin-right: 34px;
-        margin-left: 0;
-}
-#wp-admin-bar ul li#bp-adminbar-notifications-menu a span {
-        margin-right: 2px;
-        margin-left: 0;
-}