From 161ee6a46d0c15d9e2dd33a5d28905c5221011c9 Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <koop@git.wordpress.org>
Date: Sat, 12 Nov 2011 00:26:55 +0000
Subject: [PATCH] Improve admin bar markup. Un-nest top level secondary menu.
 Remove unnecessary span. see #18197.

git-svn-id: https://develop.svn.wordpress.org/trunk@19261 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/class-wp-admin-bar.php | 24 +++-------
 wp-includes/css/admin-bar.css      |  2 +-
 wp-includes/css/admin-bar.dev.css  | 75 +++++++++++-------------------
 wp-includes/script-loader.php      |  2 +-
 4 files changed, 35 insertions(+), 68 deletions(-)

diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index b3b16bc1b6..e6aae5cc37 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -142,15 +142,13 @@ class WP_Admin_Bar {
 						$this->recursive_render( $node );
 					}
 
-					if ( ! empty( $this->root->children->secondary ) ):
-						?><ul class="ab-top-menu top-secondary"><?php
+				?></ul>
+				<ul class="ab-top-menu ab-top-secondary"><?php
 
-							foreach ( $this->root->children->secondary as $node ) {
-								$this->recursive_render( $node );
-							}
+					foreach ( $this->root->children->secondary as $node ) {
+						$this->recursive_render( $node );
+					}
 
-						?></ul><?php
-					endif;
 				?></ul>
 			</div>
 		</div>
@@ -187,27 +185,19 @@ class WP_Admin_Bar {
 
 			?>><?php
 
-			if ( $is_parent ) :
-				?><span><?php
-			endif;
-
 			echo $node->title;
 
-			if ( $is_parent ) :
-				?></span><?php
-			endif;
-
 			?></a>
 
 			<?php
 			if ( $is_parent ) :
-				?><ul><?php
+				?><ul class="ab-submenu"><?php
 				foreach ( $node->children->primary as $child_node ) {
 					$this->recursive_render( $child_node );
 				}
 
 				if ( ! empty( $node->children->secondary ) ):
-					?><ul class="sub-secondary"><?php
+					?><ul class="ab-sub-secondary"><?php
 					foreach ( $node->children->secondary as $child_node ) {
 						$this->recursive_render( $child_node );
 					}
diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css
index 746ec63c1d..6bd113aae9 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 13px/28px sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar ul li:before,#wpadminbar ul li: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 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,#373737,#464646 5px);background-image:-moz-linear-gradient(bottom,#373737,#464646 5px);background-image:-o-linear-gradient(bottom,#373737,#464646 5px);background-image:-webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#373737,#464646 5px);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks{border-left:1px solid transparent;}#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 .top-secondary>li{border-left:1px solid #333;border-right:0;float:right;}#wpadminbar .quicklinks .top-secondary>li>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-top:6px;padding-bottom:6px;-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 .top-secondary .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 .top-secondary .menupop li:hover>ul,#wpadminbar .quicklinks .top-secondary .menupop li.hover>ul{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu>li:hover,#wpadminbar .ab-top-menu>li>a:focus{background:#3a3a3a;background-image:-ms-linear-gradient(bottom,#3a3a3a,#222);background-image:-moz-linear-gradient(bottom,#3a3a3a,#222);background-image:-o-linear-gradient(bottom,#3a3a3a,#222);background-image:-webkit-gradient(linear,left bottom,left top,from(#3a3a3a),to(#222));background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);background-image:linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu>li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover,#wpadminbar .quicklinks .menupop>a:focus{background:#fff;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadminbar.nojs .quicklinks .menupop:hover span,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop.hover span,#wpadminbar .quicklinks .menupop a:focus,#wpadminbar .quicklinks .menupop a:focus span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover,#wpadminbar .quicklinks .menupop a:focus{background-color:#eaf2fa;}#wpadminbar .quicklinks .menupop>a:focus{background-color:#fff;}#wpadminbar .ab-top-menu>.menupop>a span{white-space:nowrap;}#wpadminbar .ab-top-menu>li>a:hover,#wpadminbar .ab-top-menu>li>a:hover span,#wpadminbar .ab-top-menu>li>a:focus,#wpadminbar .ab-top-menu>li>a:focus span{color:#fafafa;}#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 .top-secondary .menupop li a>span{background-position:-28px -31px;padding:0 0 0 1.5em;}#wpadminbar .quicklinks .menupop ul.sub-secondary{display:block;position:relative;right:auto;margin:0;border:0;background:#eee;margin:6px 0 -6px;border-top:1px solid #dfdfdf;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;}#wpadminbar .quicklinks .menupop .sub-secondary>li:hover,#wpadminbar .quicklinks .menupop .sub-secondary>li.hover,#wpadminbar .quicklinks .menupop .sub-secondary>li a:focus{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;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .top-secondary{float:right;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child a{border-right:0;}#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;float:none;}#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 #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px 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('../images/admin-bar-search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-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 .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,#wpadminbar .quicklinks .wp-admin-bar-logo>a:focus{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-top:3px;background:#999;height:10px;width:14px;-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:3px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}#wpadminbar #ab-awaiting-mod{margin-left:4px;}#wpadminbar span.count-0{display:none;}* 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 sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar ul li:before,#wpadminbar ul li: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 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,#373737,#464646 5px);background-image:-moz-linear-gradient(bottom,#373737,#464646 5px);background-image:-o-linear-gradient(bottom,#373737,#464646 5px);background-image:-webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#373737,#464646 5px);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks{border-left:1px solid transparent;}#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 .ab-top-secondary>li{border-left:1px solid #333;border-right:0;float:right;}#wpadminbar .quicklinks .ab-top-secondary>li>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 .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding-top:6px;padding-bottom:6px;-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 .ab-top-secondary .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 strong,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a,#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 .ab-top-secondary .menupop li:hover>ul,#wpadminbar .quicklinks .ab-top-secondary .menupop li.hover>ul{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu>li:hover,#wpadminbar .ab-top-menu>li>a:focus{background-color:#3a3a3a;background-image:-ms-linear-gradient(bottom,#3a3a3a,#222);background-image:-moz-linear-gradient(bottom,#3a3a3a,#222);background-image:-o-linear-gradient(bottom,#3a3a3a,#222);background-image:-webkit-gradient(linear,left bottom,left top,from(#3a3a3a),to(#222));background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);background-image:linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu>li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover,#wpadminbar .quicklinks .menupop>a:focus{background:#fff;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop a:focus{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover,#wpadminbar .quicklinks .menupop a:focus{background-color:#eaf2fa;}#wpadminbar .ab-top-menu>li>a:hover,#wpadminbar .ab-top-menu>li>a:focus{color:#fafafa;}#wpadminbar .menupop .menupop>a{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) 93% -31px no-repeat;padding-right:2em;}#wpadminbar .ab-top-secondary .menupop .menupop>a{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) 1em -31px no-repeat;padding-left:2em;padding-right:1em;}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{display:block;position:relative;right:auto;margin:0;border:0;background:#eee;margin:6px 0 -6px;border-top:1px solid #dfdfdf;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;}#wpadminbar .quicklinks .menupop .ab-sub-secondary>li:hover,#wpadminbar .quicklinks .menupop .ab-sub-secondary>li.hover,#wpadminbar .quicklinks .menupop .ab-sub-secondary>li a:focus{background-color:#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;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .ab-top-secondary{float:right;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child a{border-right:0;}#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,#wpadminbar #wp-admin-bar-my-account .user-info .username{text-shadow:none;display:block;}#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;float:none;}#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 #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px 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('../images/admin-bar-search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-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 .wp-admin-bar-logo>a{padding-left:24px;background:url(../images/wp-logo-white.png) no-repeat 13px 6px;}#wpadminbar.nojs .wp-admin-bar-logo:hover>a,#wpadminbar .wp-admin-bar-logo.hover>a,#wpadminbar .quicklinks .wp-admin-bar-logo>a:focus{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-top:3px;background:#999;height:10px;width:14px;-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:3px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}#wpadminbar #ab-awaiting-mod{margin-left:4px;}#wpadminbar span.count-0{display:none;}* 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 7a7645820b..082217aae8 100644
--- a/wp-includes/css/admin-bar.dev.css
+++ b/wp-includes/css/admin-bar.dev.css
@@ -78,13 +78,13 @@
 	border-right: 1px solid #333;
 }
 
-#wpadminbar .quicklinks .top-secondary > li {
+#wpadminbar .quicklinks .ab-top-secondary > li {
 	border-left: 1px solid #333;
 	border-right: 0;
 	float: right;
 }
 
-#wpadminbar .quicklinks .top-secondary > li > a {
+#wpadminbar .quicklinks .ab-top-secondary > li > a {
 	border-left: 1px solid #555;
 	border-right: 0;
 }
@@ -97,10 +97,6 @@
 	margin: 0;
 }
 
-#wpadminbar .quicklinks a > span {
-	line-height: 28px;
-}
-
 #wpadminbar .quicklinks .menupop ul,
 #wpadminbar .shortlink-input {
 	margin: 0 0 0 -1px;
@@ -118,7 +114,7 @@
 	border-color: #dfdfdf;
 }
 
-#wpadminbar .quicklinks .top-secondary .menupop ul {
+#wpadminbar .quicklinks .ab-top-secondary .menupop ul {
 	right: 0;
 	margin: 0 -1px 0 0;
 }
@@ -136,12 +132,9 @@
 }
 
 #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;
@@ -167,8 +160,8 @@
 	border-width: 1px;
 }
 
-#wpadminbar .quicklinks .top-secondary .menupop li:hover > ul,
-#wpadminbar .quicklinks .top-secondary .menupop li.hover > ul {
+#wpadminbar .quicklinks .ab-top-secondary .menupop li:hover > ul,
+#wpadminbar .quicklinks .ab-top-secondary .menupop li.hover > ul {
 	margin-left: 0;
 	left: inherit;
 	right: 100%;
@@ -176,7 +169,7 @@
 
 #wpadminbar .ab-top-menu > li:hover,
 #wpadminbar .ab-top-menu > li > a:focus {
-	background: #3a3a3a; /* Fallback */
+	background-color: #3a3a3a; /* Fallback */
 	background-image: -ms-linear-gradient(bottom, #3a3a3a, #222); /* IE10 */
 	background-image: -moz-linear-gradient(bottom, #3a3a3a, #222); /* Firefox */
 	background-image: -o-linear-gradient(bottom, #3a3a3a, #222); /* Opera */
@@ -192,11 +185,8 @@
 }
 
 #wpadminbar.nojs .quicklinks .menupop:hover a,
-#wpadminbar.nojs .quicklinks .menupop:hover span,
 #wpadminbar .quicklinks .menupop.hover a,
-#wpadminbar .quicklinks .menupop.hover span,
-#wpadminbar .quicklinks .menupop a:focus,
-#wpadminbar .quicklinks .menupop a:focus span {
+#wpadminbar .quicklinks .menupop a:focus {
 	color: #333;
 	text-shadow: none;
 }
@@ -207,38 +197,24 @@
 	background-color: #eaf2fa;
 }
 
-#wpadminbar .quicklinks .menupop > a:focus {
-	background-color: #fff;
-}
-
-#wpadminbar .ab-top-menu > .menupop > a span {
-	white-space: nowrap;
-}
-
 #wpadminbar .ab-top-menu > li > a:hover,
-#wpadminbar .ab-top-menu > li > a:hover span,
-#wpadminbar .ab-top-menu > li > a:focus,
-#wpadminbar .ab-top-menu > li > a:focus span {
+#wpadminbar .ab-top-menu > li > a:focus {
 	color: #fafafa;
 }
 
-#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 {
+#wpadminbar .menupop .menupop > a {
 	display: block;
-	background: url(../images/admin-bar-sprite.png?d=11122010) right -31px no-repeat;
-	padding: 0 1.5em 0 0;
+	background: url(../images/admin-bar-sprite.png?d=11122010) 93% -31px no-repeat;
+	padding-right: 2em;
 }
 
-#wpadminbar .top-secondary .menupop li a > span {
-	background-position: -28px -31px;
-	padding: 0 0 0 1.5em;
+#wpadminbar .ab-top-secondary .menupop .menupop > a {
+	background: url(../images/admin-bar-sprite-rtl.png?d=11122010) 1em -31px no-repeat;
+	padding-left: 2em;
+	padding-right: 1em;
 }
 
-#wpadminbar .quicklinks .menupop ul.sub-secondary {
+#wpadminbar .quicklinks .menupop ul.ab-sub-secondary {
 	display: block;
 	position: relative;
 	right: auto;
@@ -254,10 +230,10 @@
 	box-shadow: none;
 }
 
-#wpadminbar .quicklinks .menupop .sub-secondary > li:hover,
-#wpadminbar .quicklinks .menupop .sub-secondary > li.hover,
-#wpadminbar .quicklinks .menupop .sub-secondary > li a:focus {
-	background: #dfdfdf;
+#wpadminbar .quicklinks .menupop .ab-sub-secondary > li:hover,
+#wpadminbar .quicklinks .menupop .ab-sub-secondary > li.hover,
+#wpadminbar .quicklinks .menupop .ab-sub-secondary > li a:focus {
+	background-color: #dfdfdf;
 }
 
 #wpadminbar .quicklinks a span#ab-updates {
@@ -277,7 +253,7 @@
 	color: #000;
 }
 
-#wpadminbar .top-secondary {
+#wpadminbar .ab-top-secondary {
 	float: right;
 }
 
@@ -326,6 +302,11 @@
 	height: 18px;
 }
 
+#wpadminbar #wp-admin-bar-my-account .user-info .display-name,
+#wpadminbar #wp-admin-bar-my-account .user-info .username {
+	text-shadow: none;
+	display: block;
+}
 #wpadminbar #wp-admin-bar-my-account .user-info .display-name {
 	color: #333;
 }
@@ -441,10 +422,6 @@
 	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,
 #wpadminbar .quicklinks .wp-admin-bar-logo > a:focus {
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index da64d96fb1..596b1b51c1 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -452,7 +452,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(), '20111109' );
+	$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20111111' );
 	$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20111107' );
 	$styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20111107' );
 	$styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array(), '20111017' );