Index: wp-includes/admin-bar.php =================================================================== --- wp-includes/admin-bar.php (revision 16860) +++ wp-includes/admin-bar.php (working copy) @@ -121,16 +121,16 @@ foreach ( (array) $wp_admin_bar->user->blogs as $blog ) { // @todo Replace with some favicon lookup. //$blavatar = 'Blavatar'; - $blavatar = '' . esc_attr__( 'Blavatar' ) . ''; + $blavatar = '' . esc_attr__( 'Blavatar' ) . ''; $marker = ''; - if ( strlen($blog->blogname) > 15 ) + if ( strlen($blog->blogname) > 18 ) $marker = '...'; if ( empty( $blog->blogname ) ) $blogname = $blog->domain; else - $blogname = substr( $blog->blogname, 0, 15 ) . $marker; + $blogname = substr( $blog->blogname, 0, 18 ) . $marker; if ( ! isset( $blog->visible ) || $blog->visible === true ) { $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id), ) ); Index: wp-includes/js/admin-bar.dev.js =================================================================== --- wp-includes/js/admin-bar.dev.js (revision 16860) +++ wp-includes/js/admin-bar.dev.js (working copy) @@ -28,14 +28,14 @@ while ( t && t != aB && t != d ) { if( 'LI' == t.nodeName.toUpperCase() ) { ancestors[ ancestors.length ] = t; - id = getTOID(t); + id = getTOID(t); if ( id ) clearTimeout( id ); t.className = t.className ? ( t.className.replace(hc, '') + ' hover' ) : 'hover'; } t = t.parentNode; } - + /* remove the hover class for any objects not in the immediate element's ancestry */ while ( i-- ) { inA = false; @@ -44,9 +44,8 @@ if ( ancestors[ ancestorLength ] == q[i][1] ) inA = true; } - - /* keep delayed hover on mu (superadmin) menu because it's so easy to mouse away from */ - if ( ! inA && -1 == q[i][1].className.indexOf('ab-superadmin') ) + + if ( ! inA ) q[i][1].className = q[i][1].className ? q[i][1].className.replace(hc, '') : ''; } }, @@ -67,7 +66,6 @@ clickShortlink = function(e) { var t = e.target || e.srcElement, links, i; - if ( 'undefined' == typeof adminBarL10n ) return; @@ -95,7 +93,7 @@ return false; } } - + alert( adminBarL10n.noShortlink ); return false; } @@ -104,7 +102,7 @@ addEvent(w, 'load', function() { var b = d.getElementsByTagName('body')[0], s = d.getElementById('adminbar-search'); - + aB = d.getElementById('wpadminbar'); if ( b && aB ) { @@ -132,7 +130,7 @@ this.value = this.getAttribute('title') == this.value ? '' : this.value; } } - + if ( w.location.hash ) w.scrollBy(0,-32); }); Index: wp-includes/css/admin-bar.dev.css =================================================================== --- wp-includes/css/admin-bar.dev.css (revision 16860) +++ wp-includes/css/admin-bar.dev.css (working copy) @@ -13,6 +13,13 @@ min-width: 960px; } +#wpadminbar a, +#wpadminbar a:hover { + outline: none; + border: none; + text-decoration: none; +} + #wpadminbar ul, #wpadminbar ul li { background: none; @@ -23,13 +30,14 @@ z-index: 99999; } -#wpadminbar ul li img { - vertical-align: middle !important; - margin-right: 8px !important; - border: none !important; - padding: 0 !important; +#wpadminbar .quicklinks ul { + text-align: left; } +#wpadminbar .quicklinks ul li { + float: left; +} + #wpadminbar .quicklinks > ul > li > a { border-right: 1px solid #686868; border-left: 1px solid #808080; @@ -43,215 +51,150 @@ border-left-color: #707070; } -#wpadminbar a { - outline: none; -} - -#wpadminbar .avatar { - border: 1px solid #999 !important; - padding: 0 !important; - margin: -3px 5px 0 0 !important; - vertical-align: middle; - float: none; - display: inline !important; -} - -#wpadminbar li:hover > ul, -#wpadminbar li.hover > ul { +#wpadminbar .quicklinks a { + color: #ddd; + height: 28px; + text-shadow: #555 0px -1px 0px; display: block; -} - - -#wpadminbar .menupop li:hover > ul, -#wpadminbar .menupop li.hover > ul { - margin-left: 100%; - margin-top: -28px; -} - - -#wpadminbar .menupop ul li a { - color: #555 !important; - text-shadow: none; + font: 13px Arial, Helvetica, sans-serif; font-weight: normal; - white-space: nowrap; -} - -#wpadminbar .menupop a > span { - background: url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat; - padding-right: .8em; + letter-spacing: normal; + padding: 0 0.85em; line-height: 28px; } -#wpadminbar .menupop ul li a > span { - display: block; - background: url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat; - padding-right: 1.5em; - line-height: 28px; -} - -#wpadminbar ul li a span#ab-awaiting-mod, -#wpadminbar ul li a span#ab-updates { - display: inline; - background: #eee; - color: #333; - padding: 1px 5px; - font-size: 10px; - font-family: verdana; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; - text-shadow: none; -} - -#wpadminbar ul li a:hover span#ab-awaiting-mod, -#wpadminbar ul li a:hover span#ab-updates { - background: #fff; - color: #000; -} - -#wpadminbar .menupop ul { +#wpadminbar .quicklinks .menupop ul { -moz-box-shadow: 0 4px 8px rgba(0,0,0,0.1); -webkit-box-shadow: 0 4px 8px rgba(0,0,0,0.1); + box-shadow: 0 4px 8px rgba(0,0,0,0.1); background: #fff; + background: rgba(255,255,255,0.97); display: none; position: absolute; border: 1px solid #dfdfdf; - border-top: none !important; + border-top: none; float: none; } - -html>body #wpadminbar .menupop ul { - background: rgba(255,255,255,0.97); - border-color: rgba(0,0,0,0.1); -} - -#wpadminbar .menupop li { +#wpadminbar .quicklinks .menupop ul li { float: none; - margin: 0; - padding: 0; - background-image: none; } -#wpadminbar .quicklinks a { - border: none; - color: #ddd !important; - height: 28px; - text-shadow: #555 0px -1px 0px; - display: block; - font: 13px Arial, Helvetica, sans-serif; +#wpadminbar .quicklinks .menupop ul li a { + color: #555; + text-shadow: none; font-weight: normal; - letter-spacing: normal; - padding: 0 0.85em; - line-height: 28px; - text-decoration: none !important; -} - -#wpadminbar .quicklinks li ul li a { + white-space: nowrap; overflow: hidden; width: 160px; } -#wpadminbar .quicklinks a:hover { - text-shadow: #333 0px -1px 0px; +#wpadminbar .quicklinks .menupop ul li:hover > a { + color: #fff; + text-shadow: #666 0px -1px 0px; } - -#wpadminbar li:hover { - background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x; +#wpadminbar .quicklinks li:hover > ul, +#wpadminbar .quicklinks li.hover > ul { + display: block; } -#wpadminbar li li:hover { - color: #fff !important; - background: #888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x !important; - text-shadow: #666 0px -1px 0px; +#wpadminbar .quicklinks .menupop li:hover > ul, +#wpadminbar .quicklinks .menupop li.hover > ul { + margin-left: 100%; + margin-top: -28px; } -#wpadminbar li li:hover > a { - color: #fff !important; +#wpadminbar .quicklinks li:hover { + background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x; } -.quicklinks ul { - list-style: none; - margin: 0; - padding: 0; - text-align: left; +#wpadminbar .quicklinks .menupop li:hover { + background: #888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x; } -.quicklinks ul li { - float: left; - margin: 0; +#wpadminbar .quicklinks .menupop a > span { + background: url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat; + padding-right: .8em; } - -#adminbarsearch { - float: right; - height: 18px; - padding: 3px; +#wpadminbar .quicklinks .menupop ul li a > span { + display: block; + background: url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat; + padding-right: 1.5em; } -#adminbarsearch * { - color: #555; - font-size: 12px; +#wpadminbar .quicklinks a span#ab-awaiting-mod, +#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 li.ab-me:hover { - background: none; +#wpadminbar .quicklinks a:hover span#ab-awaiting-mod, +#wpadminbar .quicklinks a:hover span#ab-updates { + background: #fff; + color: #000; } -#wpadminbar li.ab-me > a { - line-height: 18px !important; - border: none !important; +#wpadminbar .quicklinks li.ab-me a { + border: none; background: url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat; - height: 28px; - padding: 0 1.15em 0 0.7em; } -#wpadminbar li.ab-blog > a:hover { - background-position: 67% 59.8%; +#wpadminbar .quicklinks li.ab-my-account a { + border-left: none; } -#wpadminbar li.ab-me img.avatar { - margin: 4px 0 0 0 !important; - vertical-align: middle; - background: #eee; - width: 16px !important; - height: 16px !important; +#wpadminbar .quicklinks li.ab-me:hover { + background: none; } -#wpadminbar li.ab-my-account a { - border-left: none !important; - padding-left: 0.7em !important; - margin-top: 0 !important; +#wpadminbar .quicklinks li.ab-me a img.avatar { + border: 1px solid #999; + margin: 5px 2px 0 -4px; + background: #eee; + width: 16px; + height: 16px; } -#wpadminbar ul li img { - width: 16px !important; - height: 16px !important; +#wpadminbar .quicklinks .menupop li a img.blavatar { + vertical-align: middle; + margin-right: 8px; } -#wpadminbar #adminbar-search { - line-height: normal !important; - width: 140px !important; - margin-top: 0px !important; +#wpadminbar #adminbarsearch { + float: right; + height: 18px; + padding: 3px; } -.adminbar-input { - display: block !important; - float: left !important; - font: 12px Arial, Helvetica, sans-serif !important; - border: 1px solid #626262 !important; - padding: 2px 3px !important; - margin: 0 3px 0 0 !important; - background: #ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat !important; - -webkit-border-radius: 0 !important; - -khtml-border-radius: 0 !important; - -moz-border-radius: 0 !important; - border-radius: 0 !important; +#wpadminbar #adminbarsearch .adminbar-input { + color: #555; + width: 140px; + display: block; + float: left; + font: 12px Arial, Helvetica, sans-serif; + border: 1px solid #626262; + padding: 2px 3px; + margin: 0 3px 0 0; + background: #ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat; + -webkit-border-radius: 0; + -khtml-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; outline: none; text-shadow: 0 1px 0 #fff; } -button.adminbar-button { +#wpadminbar #adminbarsearch .adminbar-button { position: relative; border: 0; cursor: pointer; @@ -261,58 +204,43 @@ background: url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat; padding: 0 14px 0 0; text-align: center; + outline: none; } -button.adminbar-button span { +#wpadminbar #adminbarsearch .adminbar-button span { position: relative; display: block; white-space: nowrap; height: 19px; background: url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat; padding: 3px 0 0 14px; - font: 12px Arial, Helvetica, sans-serif !important; - font-weight: bold !important; - color: #444 !important; - text-shadow: 0px 1px 0px #eee !important; + font: 12px Arial, Helvetica, sans-serif; + font-weight: bold; + color: #444; + text-shadow: 0px 1px 0px #eee; } -button.adminbar-button:active { - background-position: right -184px !important; - text-shadow: 0px 1px 0px #eee !important; +#wpadminbar #adminbarsearch .adminbar-button:active { + background-position: right -184px; + text-shadow: 0px 1px 0px #eee; } -button.adminbar-button:hover span { - color: #000 !important; +#wpadminbar #adminbarsearch .adminbar-button:hover span { + color: #000; } -button.adminbar-button:active span { - background-position: left -146px !important; +#wpadminbar #adminbarsearch .adminbar-button:active span { + background-position: left -146px; } -button.adminbar-button::-moz-focus-inner { +#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner { border: none; } -@media screen and (-webkit-min-device-pixel-ratio: 0) { - button.adminbar-button span { - margin-top: -1px; - } -} - - /** * IE 6-targeted rules */ - -* html #wpadminbar, -* html #wpadminbar .menupop a span, -* html #wpadminbar .menupop ul li a:hover, -* html .quicklinks a:hover, -* html #wpadminbar .menupop:hover { - background-image: none !important; -} - * html #wpadminbar { overflow: hidden; position: absolute; @@ -322,16 +250,9 @@ float: left; } -* html #adminbarsearch-wrap { - position: absolute; - top: 0; +* html #wpadminbar, +* html #wpadminbar .menupop a span, +* html #wpadminbar .quicklinks li, +* html #wpadminbar .quicklinks li:hover { + background-image: none; } - -* html #wpadminbar ul, -* html #wpadminbar ul li { - zoom: 1; -} - -/** - * End IE 6-targeted rules - */ Index: wp-includes/class-wp-admin-bar.php =================================================================== --- wp-includes/class-wp-admin-bar.php (revision 16860) +++ wp-includes/class-wp-admin-bar.php (working copy) @@ -89,7 +89,7 @@ function render() { ?> -
+
    menu as $id => $menu_item ) : ?>