From 590868d9156630a800dd670a52e963b44390e01b Mon Sep 17 00:00:00 2001 From: koopersmith Date: Sun, 25 Sep 2011 23:30:40 +0000 Subject: [PATCH] Second pass, admin bar overhaul. see #18197. git-svn-id: http://svn.automattic.com/wordpress/trunk@18776 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/admin-bar.php | 212 ++++++++++++++++++++------- wp-includes/class-wp-admin-bar.php | 11 +- wp-includes/css/admin-bar.css | 2 +- wp-includes/css/admin-bar.dev.css | 223 +++++++++++++++++++++-------- wp-includes/js/admin-bar.dev.js | 43 +++--- wp-includes/js/admin-bar.js | 2 +- wp-includes/script-loader.php | 4 +- 7 files changed, 356 insertions(+), 141 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 29f53e199..015b4b9cc 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -66,6 +66,54 @@ function wp_admin_bar_render() { add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); add_action( 'admin_footer', 'wp_admin_bar_render', 1000 ); +/** + * Add the WordPress logo menu. + * + * @since 3.3.0 + */ +function wp_admin_bar_wp_menu( $wp_admin_bar ) { + $wp_admin_bar->add_menu( array( + 'id' => 'wp-logo', + 'title' => ' ', + 'href' => '#', + 'meta' => array( + 'class' => 'wp-admin-bar-logo', + ), + ) ); + + // Add "About This Version" link + $wp_admin_bar->add_menu( array( + 'parent' => 'wp-logo', + 'id' => 'about', + 'title' => __('About This Version'), + 'href' => admin_url('about.php'), + ) ); + + // Add codex link + $wp_admin_bar->add_menu( array( + 'parent' => 'wp-logo', + 'id' => 'documentation', + 'title' => __('Documentation'), + 'href' => 'http://codex.wordpress.org', + ) ); + + // Add forums link + $wp_admin_bar->add_menu( array( + 'parent' => 'wp-logo', + 'id' => 'support-forums', + 'title' => __('Support Forums'), + 'href' => 'http://wordpress.org/support/', + ) ); + + // Add WordPress.org link + $wp_admin_bar->add_menu( array( + 'parent' => 'wp-logo', + 'id' => 'wporg', + 'title' => __('WordPress.org'), + 'href' => 'http://wordpress.org', + ) ); +} + /** * Add the "My Account" menu and all submenus. * @@ -74,19 +122,92 @@ add_action( 'admin_footer', 'wp_admin_bar_render', 1000 ); function wp_admin_bar_my_account_menu( $wp_admin_bar ) { global $user_identity; - $user_id = get_current_user_id(); + $user_id = get_current_user_id(); + $current_user = wp_get_current_user(); if ( 0 != $user_id ) { /* Add the 'My Account' menu */ $avatar = get_avatar( get_current_user_id(), 28 ); - $id = ( ! empty( $avatar ) ) ? 'my-account-with-avatar' : 'my-account'; $howdy = sprintf( __('Howdy, %1$s'), $user_identity ); + $class = 'opposite'; - $wp_admin_bar->add_menu( array( 'id' => $id, 'title' => $howdy . $avatar, 'href' => get_edit_profile_url( $user_id ) ) ); + if ( ! empty( $avatar ) ) + $class .= ' with-avatar'; + + $wp_admin_bar->add_menu( array( + 'id' => 'my-account', + 'title' => $howdy . $avatar, + 'href' => get_edit_profile_url( $user_id ), + 'meta' => array( + 'class' => $class, + ), + ) ); /* Add the "My Account" sub menus */ - $wp_admin_bar->add_menu( array( 'id' => 'edit-profile', 'parent' => $id, 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) ); - $wp_admin_bar->add_menu( array( 'id' => 'logout', 'parent' => $id, 'title' => __( 'Log Out' ), 'href' => wp_logout_url() ) ); + + + + $user_info = get_avatar( get_current_user_id(), 64 ); + $user_info .= "{$current_user->display_name}"; + + if ( $current_user->display_name !== $current_user->user_nicename ) + $user_info .= "{$current_user->user_nicename}"; + + $wp_admin_bar->add_menu( array( + 'parent' => 'my-account', + 'id' => 'user-info', + 'title' => $user_info, + 'meta' => array( + 'class' => 'user-info user-info-item' + ), + ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'my-account', + 'id' => 'edit-profile', + 'title' => __( 'Edit My Profile' ), + 'href' => get_edit_profile_url( $user_id ), + 'meta' => array( + 'class' => 'user-info-item', + ), + ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'my-account', + 'id' => 'logout', + 'title' => __( 'Log Out' ), + 'href' => wp_logout_url(), + 'meta' => array( + 'class' => 'user-info-item', + ), + ) ); + + $wp_admin_bar->add_menu( array( + 'parent' => 'my-account', + 'id' => 'my-account-secondary', + 'title' => ' ', + 'meta' => array( + 'class' => 'secondary', + ), + ) ); + } + + wp_admin_bar_my_sites_menu( $wp_admin_bar ); +} + +/** + * Add the "Network Admin" menu. + * + * @since 3.3.0 + */ +function wp_admin_bar_network_admin_menu( $wp_admin_bar ) { + if ( is_multisite() && is_super_admin() && ! is_network_admin() ) { + $wp_admin_bar->add_menu( array( + 'id' => 'network-admin', + 'title' => __('Network Admin'), + 'href' => network_admin_url(), + 'meta' => array( + 'class' => 'opposite', + ), + ) ); } } @@ -159,34 +280,6 @@ function wp_admin_bar_blog_admin_menu( $wp_admin_bar ) { function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { global $wpdb; - /* Add the 'My Sites' menu if the user has more than one site. */ - // if ( count( $wp_admin_bar->user->blogs ) <= 1 ) - // return; - - if ( is_multisite() ) - $url = admin_url( 'my-sites.php' ); - else - $url = admin_url(); - - $wp_admin_bar->add_menu( array( - 'id' => 'my-blogs', - 'title' => ' ', - 'href' => $url, - 'meta' => array( - 'class' => 'wp-admin-bar-logo', - ), - ) ); - - // Add network admin link - if ( is_multisite() && is_super_admin() && ! is_network_admin() ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'my-blogs', - 'id' => 'network-admin', - 'title' => __('Network Admin'), - 'href' => network_admin_url(), - ) ); - } - if ( is_user_logged_in() ) { // Add blog links $blue_wp_logo_url = includes_url('images/wpmini-blue.png'); @@ -202,34 +295,45 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { $blavatar = '' . esc_attr__( 'Blavatar' ) . ''; $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname; + $menu_id = 'blog-' . $blog->userblog_id; - $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id) ) ); - $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url($blog->userblog_id) ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'my-account-secondary', + 'id' => $menu_id, + 'title' => $blavatar . $blogname, + 'href' => get_admin_url( $blog->userblog_id ), + ) ); + + $wp_admin_bar->add_menu( array( + 'parent' => $menu_id, + 'id' => $menu_id . '-d', + 'title' => __( 'Dashboard' ), + 'href' => get_admin_url( $blog->userblog_id ), + ) ); if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) { - $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => get_admin_url($blog->userblog_id, 'post-new.php') ) ); - $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => get_admin_url($blog->userblog_id, 'edit-comments.php') ) ); + $wp_admin_bar->add_menu( array( + 'parent' => $menu_id, + 'id' => $menu_id . '-n', + 'title' => __( 'New Post' ), + 'href' => get_admin_url( $blog->userblog_id, 'post-new.php' ), + ) ); + $wp_admin_bar->add_menu( array( + 'parent' => $menu_id, + 'id' => $menu_id . '-c', + 'title' => __( 'Manage Comments' ), + 'href' => get_admin_url( $blog->userblog_id, 'edit-comments.php' ), + ) ); } - $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => get_home_url($blog->userblog_id) ) ); + $wp_admin_bar->add_menu( array( + 'parent' => $menu_id, + 'id' => $menu_id . '-v', + 'title' => __( 'Visit Site' ), + 'href' => get_home_url( $blog->userblog_id ), + ) ); } } - - // Add WordPress.org link - $wp_admin_bar->add_menu( array( - 'parent' => 'my-blogs', - 'id' => 'about', - 'title' => __('About This Version'), - 'href' => admin_url('about.php'), - ) ); - - // Add WordPress.org link - $wp_admin_bar->add_menu( array( - 'parent' => 'my-blogs', - 'id' => 'wporg', - 'title' => __('WordPress.org'), - 'href' => 'http://wordpress.org', - ) ); } /** diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index 5337dcebf..b3265c4c3 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -88,9 +88,9 @@ class WP_Admin_Bar { function render() { ?> -
+
-
    +
      menu as $id => $menu_item ) : ?> recursive_render( $id, $menu_item ) ?> @@ -173,16 +173,17 @@ class WP_Admin_Bar { } function add_menus() { + add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 ); add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 ); - add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 ); add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 ); + add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 ); + add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 ); add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 ); add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 ); + add_action( 'admin_bar_menu', 'wp_admin_bar_network_admin_menu', 80 ); if ( ! is_admin() ) { add_action( 'admin_bar_menu', 'wp_admin_bar_blog_front_menu', 25 ); - add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 ); - add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 ); add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 ); } else { add_action( 'admin_bar_menu', 'wp_admin_bar_blog_admin_menu', 25 ); diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index e9f69a7dc..e90b6f3f7 100644 --- a/wp-includes/css/admin-bar.css +++ b/wp-includes/css/admin-bar.css @@ -1 +1 @@ -#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 12px/28px "Helvetica Neue",sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar :before,#wpadminbar :after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 12px/28px "Helvetica Neue",sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#464646,#373737 5px);background-image:-moz-linear-gradient(bottom,#464646,#373737 5px);background-image:-o-linear-gradient(bottom,#464646,#373737);background-image:-webkit-gradient(linear,left bottom,left top,from(#464646),to(#373737));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#464646,#373737);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar .quicklinks ul li{float:left;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #555;border-left:1px solid #333;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 .85em;margin:0;}#wpadminbar .quicklinks a>span{line-height:28px;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 1px;padding:6px 0;-moz-box-shadow:0 4px 8px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.2);box-shadow:0 4px 8px rgba(0,0,0,0.2);background:#fff;display:none;position:absolute;border-top:none;float:none;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a span,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojq .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .quicklinks li:hover,#wpadminbar .quicklinks .selected{background-color:#fff;}#wpadminbar .quicklinks li:hover a,#wpadminbar .quicklinks .selected a,#wpadminbar .quicklinks li:hover span,#wpadminbar .quicklinks .selected span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover{background:#f8fbfe;}#wpadminbar .quicklinks .menupop a>span{display:inline;background:url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat;padding-right:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) right -29px no-repeat;padding-right:1.5em;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar #wp-admin-bar-my-account,#wpadminbar #wp-admin-bar-my-account-with-avatar{float:right;}#wpadminbar .quicklinks li#wp-admin-bar-my-account>a{border:none;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar>a{border:none;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar>a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar .quicklinks .admin-bar-search:hover>a{border-right:none;border-left:1px solid #333;}#wpadminbar #adminbarsearch{float:right;height:26px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:12px "Helvetica Neue",sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../../wp-content/themes/twentyeleven/images/search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;-khtml-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar #adminbarsearch .adminbar-button:active{background:#a0a0a0;background:-moz-linear-gradient(bottom,#a0a0a0,#c1c1c1);background:-webkit-gradient(linear,left bottom,left top,from(#a0a0a0),to(#c1c1c1));-moz-box-shadow:inset 1px 1px 1px #9b9b9b;-webkit-box-shadow:inset 1px 1px 1px #9b9b9b;box-shadow:inset 1px 1px 1px #9b9b9b;}#wpadminbar #adminbarsearch .adminbar-button:hover{color:#000;}#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner{border:none;}#wpadminbar .wp-admin-bar-logo{background:url(../images/wp-logo-white.png) no-repeat 8px 6px;}#wpadminbar .wp-admin-bar-logo>a{padding-left:22px;}#wpadminbar .wp-admin-bar-logo:hover{background:url(../images/wp-logo-dark.png) no-repeat 8px 6px;}#wpadminbar .ab-comments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin:3px 4px 0 -2px;background:#999;height:10px;width:14px;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:1px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;} \ No newline at end of file +#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 13px/28px "Helvetica Neue",sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar :before,#wpadminbar :after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 13px/28px "Helvetica Neue",sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#464646,#373737 5px);background-image:-moz-linear-gradient(bottom,#464646,#373737 5px);background-image:-o-linear-gradient(bottom,#464646,#373737);background-image:-webkit-gradient(linear,left bottom,left top,from(#464646),to(#373737));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#464646,#373737);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar li{float:left;}#wpadminbar .quicklinks>ul>li{border-right:1px solid #555;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #333;}#wpadminbar .quicklinks>ul>li.opposite{border-left:1px solid #333;border-right:0;}#wpadminbar .quicklinks>ul>li.opposite>a{border-left:1px solid #555;border-right:0;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 1em;margin:0;}#wpadminbar .quicklinks a>span{line-height:28px;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding:6px 0;-moz-box-shadow:0 4px 6px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 6px rgba(0,0,0,0.2);box-shadow:0 4px 6px rgba(0,0,0,0.2);background:#fff;display:none;position:absolute;float:none;border-width:0 1px 1px 1px;border-style:solid;border-color:#dfdfdf;}#wpadminbar .quicklinks .opposite.menupop ul{right:0;margin:0 -1px 0 0;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a span,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar .quicklinks .menupop.hover ul li a span,#wpadminbar.nojs .quicklinks .menupop:hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a span,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojs .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .quicklinks .opposite.menupop li:hover>ul,#wpadminbar .quicklinks .opposite.menupop li.hover>ul{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu>li:hover{background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu>li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover{background:#fff;}#wpadminbar .ab-top-menu .selected.screen-meta-toggle{background:#f1f1f1;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadminbar.nojs .quicklinks .menupop:hover span,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop.hover span,#wpadminbar .ab-top-menu .selected.screen-meta-toggle a,#wpadminbar .ab-top-menu .selected.screen-meta-toggle span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover{background-color:#eaf2fa;}#wpadminbar .ab-top-menu>.menupop>a span{padding-right:10px;margin-right:-10px;}#wpadminbar .ab-top-menu>li>a:hover,#wpadminbar .ab-top-menu>li>a:hover span{color:#fafafa;}#wpadminbar .ab-top-menu>li>a:hover span{background:url(../images/admin-bar-sprite.png?d=11122010) right -57px no-repeat;}#wpadminbar.nojs .ab-top-menu>li>a:hover span,#wpadminbar .ab-top-menu>li.hover>a:hover span{background:none;}#wpadminbar .menupop li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) right -31px no-repeat;padding:0 1.5em 0 0;}#wpadminbar .opposite.menupop li a>span{background-position:-28px -31px;padding:0 0 0 1.5em;}#wpadminbar .quicklinks .menupop .secondary{background:#eee;margin:6px 0 -6px;border-top:1px solid #dfdfdf;}#wpadminbar .quicklinks .menupop .secondary>a{display:none;}#wpadminbar .quicklinks .menupop li.secondary>ul,#wpadminbar .quicklinks .opposite.menupop li.secondary>ul{display:block;position:relative;right:auto;margin:0;border:0;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;background:#eee;}#wpadminbar .quicklinks .menupop li.secondary>ul>li:hover,#wpadminbar .quicklinks .menupop li.secondary>ul>li.hover{background:#dfdfdf;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar li.opposite{float:right;}#wp-admin-bar-my-account>ul{min-width:270px;}#wpadminbar #wp-admin-bar-my-account .user-info-item{margin-left:88px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item>a{padding-left:8px;}#wpadminbar #wp-admin-bar-my-account .user-info{margin-top:6px;margin-bottom:15px;height:auto;background:none;}#wp-admin-bar-my-account .user-info .avatar{position:absolute;left:-72px;top:4px;}#wpadminbar #wp-admin-bar-my-account .user-info a{height:auto;}#wpadminbar #wp-admin-bar-my-account .user-info span{background:none;padding:0;height:18px;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name{color:#333;}#wpadminbar #wp-admin-bar-my-account .user-info .username{color:#999;font-size:11px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search{border-right:0;}#wpadminbar #wp-admin-bar-search a{padding:0;border-right:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px "Helvetica Neue",sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../../wp-content/themes/twentyeleven/images/search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;-khtml-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar #adminbarsearch .adminbar-button:active{background:#a0a0a0;background:-moz-linear-gradient(bottom,#a0a0a0,#c1c1c1);background:-webkit-gradient(linear,left bottom,left top,from(#a0a0a0),to(#c1c1c1));-moz-box-shadow:inset 1px 1px 1px #9b9b9b;-webkit-box-shadow:inset 1px 1px 1px #9b9b9b;box-shadow:inset 1px 1px 1px #9b9b9b;}#wpadminbar #adminbarsearch .adminbar-button:hover{color:#000;}#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner{border:none;}#wpadminbar .wp-admin-bar-logo>a{padding-left:24px;background:url(../images/wp-logo-white.png) no-repeat 13px 6px;}#wpadminbar .wp-admin-bar-logo>a span{height:28px;}#wpadminbar.nojs .wp-admin-bar-logo:hover>a,#wpadminbar .wp-admin-bar-logo.hover>a{background:url(../images/wp-logo-dark.png) no-repeat 12px 6px;}#wpadminbar .ab-comments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin:3px 4px 0 -2px;background:#999;height:10px;width:14px;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:1px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;} \ No newline at end of file diff --git a/wp-includes/css/admin-bar.dev.css b/wp-includes/css/admin-bar.dev.css index d57a7b623..d17c912e6 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -7,7 +7,7 @@ text-transform: none; letter-spacing: normal; line-height: 1; - font: normal 12px/28px "Helvetica Neue", sans-serif; + font: normal 13px/28px "Helvetica Neue", sans-serif; color: #ccc; text-shadow: #444 0px -1px 0px; } @@ -30,7 +30,7 @@ #wpadminbar { direction: ltr; color: #ccc; - font: normal 12px/28px "Helvetica Neue", sans-serif; + font: normal 13px/28px "Helvetica Neue", sans-serif; height: 28px; position: fixed; top: 0; @@ -62,24 +62,35 @@ text-align: left; } -#wpadminbar .quicklinks ul li { +#wpadminbar li { float: left; } -#wpadminbar .quicklinks > ul > li > a { + +#wpadminbar .quicklinks > ul > li { border-right: 1px solid #555; +} +#wpadminbar .quicklinks > ul > li > a { + border-right: 1px solid #333; +} +#wpadminbar .quicklinks > ul > li.opposite { border-left: 1px solid #333; + border-right: 0; +} +#wpadminbar .quicklinks > ul > li.opposite > a { + border-left: 1px solid #555; + border-right: 0; } -#wpadminbar .quicklinks > ul > li:last-child > a { +/*#wpadminbar .quicklinks > ul > li:last-child > a { border-right: none; -} +}*/ #wpadminbar .quicklinks a, #wpadminbar .shortlink-input { height: 28px; display: block; - padding: 0 0.85em; + padding: 0 1em; margin: 0; } @@ -89,16 +100,22 @@ #wpadminbar .quicklinks .menupop ul, #wpadminbar .shortlink-input { - margin: 0 0 0 1px; + margin: 0 0 0 -1px; padding: 6px 0; - -moz-box-shadow: 0 4px 8px rgba(0,0,0,0.2); - -webkit-box-shadow: 0 4px 8px rgba(0,0,0,0.2); - box-shadow: 0 4px 8px rgba(0,0,0,0.2); + -moz-box-shadow: 0 4px 6px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 4px 6px rgba(0,0,0,0.2); + box-shadow: 0 4px 6px rgba(0,0,0,0.2); background: #fff; display: none; position: absolute; - border-top: none; float: none; + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: #dfdfdf; +} +#wpadminbar .quicklinks .opposite.menupop ul { + right: 0; + margin: 0 -1px 0 0; } #wpadminbar .selected .shortlink-input { @@ -116,6 +133,10 @@ #wpadminbar .quicklinks .menupop ul li a, #wpadminbar .quicklinks .menupop ul li a span, #wpadminbar .quicklinks .menupop ul li a strong, +#wpadminbar .quicklinks .menupop.hover ul li a, +#wpadminbar .quicklinks .menupop.hover ul li a span, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a, +#wpadminbar.nojs .quicklinks .menupop:hover ul li a span, #wpadminbar .shortlink-input { line-height: 26px; height: 26px; @@ -129,7 +150,7 @@ width: 200px; } -#wpadminbar.nojq .quicklinks li:hover > ul, +#wpadminbar.nojs .quicklinks li:hover > ul, #wpadminbar .quicklinks li.hover > ul { display: block; } @@ -137,40 +158,99 @@ #wpadminbar .quicklinks .menupop li:hover > ul, #wpadminbar .quicklinks .menupop li.hover > ul { margin-left: 100%; - margin-top: -28px; + margin-top: -33px; + border-width: 1px; } -#wpadminbar .quicklinks li:hover, -#wpadminbar .quicklinks .selected { - background-color: #fff; +#wpadminbar .quicklinks .opposite.menupop li:hover > ul, +#wpadminbar .quicklinks .opposite.menupop li.hover > ul { + margin-left: 0; + left: inherit; + right: 100%; } -#wpadminbar .quicklinks li:hover a, -#wpadminbar .quicklinks .selected a, -#wpadminbar .quicklinks li:hover span, -#wpadminbar .quicklinks .selected span { +#wpadminbar .ab-top-menu > li:hover { + /* @todo: add other gradients */ + background-image: -webkit-linear-gradient(bottom, #3a3a3a, #222); /* new Webkit */ +} + +#wpadminbar.nojs .ab-top-menu > li.menupop:hover, +#wpadminbar .ab-top-menu li.menupop.hover { + background: #fff; +} +#wpadminbar .ab-top-menu .selected.screen-meta-toggle { + background: #f1f1f1; +} + +#wpadminbar.nojs .quicklinks .menupop:hover a, +#wpadminbar.nojs .quicklinks .menupop:hover span, +#wpadminbar .quicklinks .menupop.hover a, +#wpadminbar .quicklinks .menupop.hover span, +#wpadminbar .ab-top-menu .selected.screen-meta-toggle a, +#wpadminbar .ab-top-menu .selected.screen-meta-toggle span { color: #333; text-shadow: none; } -#wpadminbar .quicklinks .menupop li:hover { -/* background: #888; - background: -moz-linear-gradient(bottom, #888, #9d9d9d); - background: -webkit-gradient(linear, left bottom, left top, from(#888), to(#9d9d9d));*/ - background: #f8fbfe; +#wpadminbar .quicklinks .menupop li:hover, +#wpadminbar .quicklinks .menupop li.hover { + background-color: #eaf2fa; } -#wpadminbar .quicklinks .menupop a > span { - display: inline; - background: url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat; - padding-right: .8em; +#wpadminbar .ab-top-menu > .menupop > a span { + padding-right: 10px; + margin-right: -10px; +} +#wpadminbar .ab-top-menu > li > a:hover, +#wpadminbar .ab-top-menu > li > a:hover span { + color: #fafafa; +} +#wpadminbar .ab-top-menu > li > a:hover span { + background: url(../images/admin-bar-sprite.png?d=11122010) right -57px no-repeat; +} +#wpadminbar.nojs .ab-top-menu > li > a:hover span, +#wpadminbar .ab-top-menu > li.hover > a:hover span { + background: none; } -#wpadminbar .quicklinks .menupop ul li a > span { +#wpadminbar .menupop li a > span { display: block; - background: url(../images/admin-bar-sprite.png?d=11122010) right -29px no-repeat; - padding-right: 1.5em; + background: url(../images/admin-bar-sprite.png?d=11122010) right -31px no-repeat; + padding: 0 1.5em 0 0; +} +#wpadminbar .opposite.menupop li a > span { + background-position: -28px -31px; + padding: 0 0 0 1.5em; +} + +#wpadminbar .quicklinks .menupop .secondary { + background: #eee; + margin: 6px 0 -6px; + border-top: 1px solid #dfdfdf; +} + +#wpadminbar .quicklinks .menupop .secondary > a { + display: none; +} +#wpadminbar .quicklinks .menupop li.secondary > ul, +#wpadminbar .quicklinks .opposite.menupop li.secondary > ul { + display: block; + position: relative; + right: auto; + margin: 0; + border: 0; + + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + + background: #eee; +} + +#wpadminbar .quicklinks .menupop li.secondary > ul > li:hover, +#wpadminbar .quicklinks .menupop li.secondary > ul > li.hover { + background: #dfdfdf; } #wpadminbar .quicklinks a span#ab-updates { @@ -192,20 +272,49 @@ color: #000; } -#wpadminbar #wp-admin-bar-my-account, -#wpadminbar #wp-admin-bar-my-account-with-avatar { +#wpadminbar li.opposite { float: right; } -#wpadminbar .quicklinks li#wp-admin-bar-my-account > a { - border: none; +#wp-admin-bar-my-account > ul { + min-width: 270px; +} +#wpadminbar #wp-admin-bar-my-account .user-info-item { + margin-left: 88px; + margin-right: 16px; +} +#wpadminbar #wp-admin-bar-my-account .user-info-item > a { + padding-left: 8px; } -#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar > a { - border: none; +#wpadminbar #wp-admin-bar-my-account .user-info { + margin-top: 6px; + margin-bottom: 15px; + height: auto; + background: none; +} +#wp-admin-bar-my-account .user-info .avatar { + position: absolute; + left: -72px; + top: 4px; +} +#wpadminbar #wp-admin-bar-my-account .user-info a { + height: auto; +} +#wpadminbar #wp-admin-bar-my-account .user-info span { + background: none; + padding: 0; + height: 18px; +} +#wpadminbar #wp-admin-bar-my-account .user-info .display-name { + color: #333; +} +#wpadminbar #wp-admin-bar-my-account .user-info .username { + color: #999; + font-size: 11px; } -#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar > a img { +#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { width: 16px; height: 16px; border: 1px solid #999; @@ -216,43 +325,39 @@ margin: -2px 0 0 6px; } -#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul ul { - left: 0; -} - #wpadminbar .quicklinks li img.blavatar { vertical-align: middle; margin: -3px 4px 0 0; padding: 0; } +#wpadminbar #wp-admin-bar-search { + border-right: 0; +} + #wpadminbar #wp-admin-bar-search a { padding: 0; + border-right: 0; } #wpadminbar .quicklinks .admin-bar-search:hover { /* default background */ background: transparent; } -#wpadminbar .quicklinks .admin-bar-search:hover > a { - /* default borders */ - border-right: none; - border-left: 1px solid #333; -} #wpadminbar #adminbarsearch { float: right; - height: 26px; + height: 24px; padding: 2px 4px; -/* padding: 0;*/ margin: 0; } + #wpadminbar #adminbarsearch .adminbar-input { height: 23px; width: 140px; float: left; - font: 12px "Helvetica Neue", sans-serif; + font: 13px "Helvetica Neue", sans-serif; border: none; padding: 0 3px 0 24px; margin: 0 3px 0 0; @@ -333,15 +438,17 @@ * WP Logo item */ -#wpadminbar .wp-admin-bar-logo { - background: url(../images/wp-logo-white.png) no-repeat 8px 6px; -} #wpadminbar .wp-admin-bar-logo > a { - padding-left: 22px; + padding-left: 24px; + background: url(../images/wp-logo-white.png) no-repeat 13px 6px; +} +#wpadminbar .wp-admin-bar-logo > a span { + height: 28px; } -#wpadminbar .wp-admin-bar-logo:hover { - background: url(../images/wp-logo-dark.png) no-repeat 8px 6px; +#wpadminbar.nojs .wp-admin-bar-logo:hover > a, +#wpadminbar .wp-admin-bar-logo.hover > a { + background: url(../images/wp-logo-dark.png) no-repeat 12px 6px; } /** diff --git a/wp-includes/js/admin-bar.dev.js b/wp-includes/js/admin-bar.dev.js index 85bd3d0f8..e643d73e9 100644 --- a/wp-includes/js/admin-bar.dev.js +++ b/wp-includes/js/admin-bar.dev.js @@ -4,7 +4,7 @@ if ( typeof(jQuery) != 'undefined' ) { (function(a){a.fn.hoverIntent=function(l,j){var m={sensitivity:7,interval:100,timeout:0};m=a.extend(m,j?{over:l,out:j}:l);var o,n,h,d;var e=function(f){o=f.pageX;n=f.pageY};var c=function(g,f){f.hoverIntent_t=clearTimeout(f.hoverIntent_t);if((Math.abs(h-o)+Math.abs(d-n))add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110628', 1 ); - $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20110801' ); + $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20110925' ); $scripts->add_data( 'admin-bar', 'group', 1 ); $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110802', 1 ); @@ -450,7 +450,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); - $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110916b' ); + $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110925' ); $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101224' ); $styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20110802' ); $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array(), '20110918' );