From 924ed5885cfbc9e279b502d34b66dc3fbb090a27 Mon Sep 17 00:00:00 2001 From: koopersmith Date: Fri, 18 Nov 2011 00:12:57 +0000 Subject: [PATCH] Allow linkless items in the admin bar. Improve non-jQuery admin bar tabbing. fixes #19277, #19149, #19164, #15519. see #18197, #19088. git-svn-id: http://svn.automattic.com/wordpress/trunk@19328 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/admin-bar.php | 17 ++---- wp-includes/class-wp-admin-bar.php | 33 +++++++---- wp-includes/css/admin-bar.css | 2 +- wp-includes/css/admin-bar.dev.css | 95 ++++++++++++++++++------------ wp-includes/js/admin-bar.dev.js | 10 ++-- wp-includes/js/admin-bar.js | 2 +- wp-includes/script-loader.php | 4 +- 7 files changed, 92 insertions(+), 71 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index daa9501885..089a11af44 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -74,11 +74,8 @@ add_action( 'admin_footer', 'wp_admin_bar_render', 1000 ); function wp_admin_bar_wp_menu( $wp_admin_bar ) { $wp_admin_bar->add_menu( array( 'id' => 'wp-logo', - 'title' => ' ', + 'title' => '', 'href' => admin_url( 'about.php' ), - 'meta' => array( - 'class' => 'wp-admin-bar-logo', - ), ) ); if ( is_user_logged_in() ) { @@ -584,20 +581,18 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) { * @since 3.3.0 */ function wp_admin_bar_search_menu( $wp_admin_bar ) { - $form = '
'; - $form .= '
'; - $form .= ''; + $form = ''; + $form .= ''; $form .= ''; $form .= '
'; - $form .= '
'; $wp_admin_bar->add_menu( array( 'id' => 'search', 'title' => $form, - 'href' => '#', 'meta' => array( - 'class' => 'admin-bar-search' + 'class' => 'admin-bar-search', + 'tabindex' => -1, ) ) ); } diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index 465aebbf49..fa21ef4376 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -163,6 +163,7 @@ class WP_Admin_Bar { } $is_parent = (bool) $node->children->primary; + $has_link = (bool) $node->href; $menuclass = $is_parent ? 'menupop' : ''; if ( ! empty( $node->meta['class'] ) ) @@ -171,25 +172,31 @@ class WP_Admin_Bar { $tabindex = !empty($node->meta['tabindex']) ? $node->meta['tabindex'] : 10; ?> -
  • id}" ); ?>" class=""> - meta['onclick'] ) ) : - ?> onclick="meta['onclick'] ); ?>"id}" ); ?>" class="">meta['onclick'] ) ) : + ?> onclick="meta['onclick'] ); ?>"meta['target'] ) ) : + ?> target="meta['target'] ); ?>"meta['target'] ) ) : - ?> target="meta['target'] ); ?>"meta['title'] ) ) : + ?> title="meta['title'] ); ?>">
    meta['title'] ) ) : - ?> title="meta['title'] ); ?>">title; - ?> + if ( $has_link ): + ?>
    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 .menupop .ab-sub-wrapper,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding: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 .ab-top-secondary .menupop .ab-sub-wrapper{right:0;margin:0 -1px 0 0;}#wpadminbar .ab-submenu{padding:6px 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 li:hover>.ab-sub-wrapper,#wpadminbar li.hover>.ab-sub-wrapper{display:block;}#wpadminbar .menupop li:hover>.ab-sub-wrapper,#wpadminbar .menupop li.hover>.ab-sub-wrapper{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .ab-top-secondary .menupop li:hover>.ab-sub-wrapper,#wpadminbar .ab-top-secondary .menupop li.hover>.ab-sub-wrapper{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;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:198px;}#wp-admin-bar-my-account.with-avatar>ul{min-width:270px;}#wpadminbar #wp-admin-bar-my-account .user-info-item{margin-left:16px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account.with-avatar .user-info-item{margin-left:88px;}#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 +#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 .ab-sub-wrapper,#wpadminbar ul,#wpadminbar ul li{background:none;clear: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 .ab-empty-item{outline:none;}#wpadminbar .quicklinks>ul>li{border-right:1px solid #555;}#wpadminbar .quicklinks>ul>li>a,#wpadminbar .quicklinks>ul>li>.ab-empty-item{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,#wpadminbar .quicklinks .ab-top-secondary>li>.ab-empty-item{border-left:1px solid #555;border-right:0;}#wpadminbar .quicklinks a,#wpadminbar .quicklinks .ab-empty-item,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 1em;margin:0;}#wpadminbar .menupop .ab-sub-wrapper,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding: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 .ab-top-secondary .menupop .ab-sub-wrapper{right:0;margin:0 -1px 0 0;}#wpadminbar .ab-submenu{padding:6px 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 .ab-item,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .quicklinks .menupop.hover ul li .ab-item,#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,#wpadminbar .shortlink-input{line-height:26px;height:26px;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojs li:hover>.ab-sub-wrapper,#wpadminbar li.hover>.ab-sub-wrapper{display:block;}#wpadminbar .menupop li:hover>.ab-sub-wrapper,#wpadminbar .menupop li.hover>.ab-sub-wrapper{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .ab-top-secondary .menupop li:hover>.ab-sub-wrapper,#wpadminbar .ab-top-secondary .menupop li.hover>.ab-sub-wrapper{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu>li:hover>.ab-item,#wpadminbar .ab-top-menu>li.hover>.ab-item,#wpadminbar .ab-top-menu>li>.ab-item:focus,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus{color:#fafafa;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>.ab-item,#wpadminbar .ab-top-menu>li.menupop.hover>.ab-item{background:#fff;color:#333;text-shadow:none;}#wpadminbar .menupop li:hover,#wpadminbar .menupop li.hover,#wpadminbar .quicklinks .menupop .ab-item:focus,#wpadminbar .quicklinks .ab-top-menu .menupop .ab-item:focus{background-color:#eaf2fa;}#wpadminbar .ab-submenu .ab-item{color:#333;text-shadow:none;}#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{color:#21759B;}#wpadminbar .menupop .menupop>.ab-item{display:block;background-image:url(../images/admin-bar-sprite-rtl.png?d=11122010);background-position:93% -31px;background-repeat:no-repeat;padding-right:2em;}#wpadminbar .ab-top-secondary .menupop .menupop>.ab-item{background-image:url(../images/admin-bar-sprite-rtl.png?d=11122010);background-position:1em -31px;background-repeat: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;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 .ab-item: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 .ab-item{border-right:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}#wp-admin-bar-my-account>ul{min-width:198px;}#wp-admin-bar-my-account.with-avatar>ul{min-width:270px;}#wpadminbar #wp-admin-bar-my-account .user-info-item{margin-left:16px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account.with-avatar .user-info-item{margin-left:88px;}#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 .ab-item{padding:0;}#wpadminbar #wp-admin-bar-search .ab-item{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 .ab-wp-logo{display:block;height:28px;width:16px;background:url(../images/wp-logo-white.png) no-repeat 0 50%;}#wpadminbar.nojs #wp-admin-bar-wp-logo:hover .ab-wp-logo,#wpadminbar #wp-admin-bar-wp-logo.hover .ab-wp-logo{background:url(../images/wp-logo-dark.png) no-repeat 0 50%;}#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 25107034e4..484b35a30e 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -73,11 +73,16 @@ float: left; } +#wpadminbar .ab-empty-item { + outline: none; +} + #wpadminbar .quicklinks > ul > li { border-right: 1px solid #555; } -#wpadminbar .quicklinks > ul > li > a { +#wpadminbar .quicklinks > ul > li > a, +#wpadminbar .quicklinks > ul > li > .ab-empty-item { border-right: 1px solid #333; } @@ -87,12 +92,14 @@ float: right; } -#wpadminbar .quicklinks .ab-top-secondary > li > a { +#wpadminbar .quicklinks .ab-top-secondary > li > a, +#wpadminbar .quicklinks .ab-top-secondary > li > .ab-empty-item { border-left: 1px solid #555; border-right: 0; } #wpadminbar .quicklinks a, +#wpadminbar .quicklinks .ab-empty-item, #wpadminbar .shortlink-input { height: 28px; display: block; @@ -137,14 +144,13 @@ font-weight: bold; } -#wpadminbar .quicklinks .menupop ul li a, +#wpadminbar .quicklinks .menupop ul li .ab-item, #wpadminbar .quicklinks .menupop ul li a strong, -#wpadminbar .quicklinks .menupop.hover ul li a, -#wpadminbar.nojs .quicklinks .menupop:hover ul li a, +#wpadminbar .quicklinks .menupop.hover ul li .ab-item, +#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item, #wpadminbar .shortlink-input { line-height: 26px; height: 26px; - color: #21759B; text-shadow: none; white-space: nowrap; min-width: 140px; @@ -173,49 +179,58 @@ right: 100%; } -#wpadminbar .ab-top-menu > li:hover, -#wpadminbar .ab-top-menu > li > a:focus { +#wpadminbar .ab-top-menu > li:hover > .ab-item, +#wpadminbar .ab-top-menu > li.hover > .ab-item, +#wpadminbar .ab-top-menu > li > .ab-item:focus, +#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus { + color: #fafafa; 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 */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#3a3a3a), to(#222)); /* old Webkit */ + background-image: -webkit-gradient(linear, left bottom, left top, from(#3a3a3a), to(#222)); /* old Webkit */ background-image: -webkit-linear-gradient(bottom, #3a3a3a, #222); /* new Webkit */ background-image: linear-gradient(bottom, #3a3a3a, #222); /* proposed W3C Markup */ } -#wpadminbar.nojs .ab-top-menu > li.menupop:hover, -#wpadminbar .ab-top-menu li.menupop.hover, -#wpadminbar .quicklinks .menupop > a:focus { +#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, +#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { 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 { +#wpadminbar .menupop li:hover, +#wpadminbar .menupop li.hover, +#wpadminbar .quicklinks .menupop .ab-item:focus, +#wpadminbar .quicklinks .ab-top-menu .menupop .ab-item:focus { background-color: #eaf2fa; } -#wpadminbar .ab-top-menu > li > a:hover, -#wpadminbar .ab-top-menu > li > a:focus { - color: #fafafa; +#wpadminbar .ab-submenu .ab-item { + color: #333; + text-shadow: none; } -#wpadminbar .menupop .menupop > a { +#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 { + color: #21759B; +} + +#wpadminbar .menupop .menupop > .ab-item { display: block; - background: url(../images/admin-bar-sprite.png?d=11122010) 93% -31px no-repeat; + background-image: url(../images/admin-bar-sprite-rtl.png?d=11122010); + background-position: 93% -31px; + background-repeat: 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; +#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item { + background-image: url(../images/admin-bar-sprite-rtl.png?d=11122010); + background-position: 1em -31px; + background-repeat: no-repeat; padding-left: 2em; padding-right: 1em; } @@ -237,7 +252,7 @@ #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 { +#wpadminbar .quicklinks .menupop .ab-sub-secondary > li .ab-item:focus { background-color: #dfdfdf; } @@ -263,8 +278,11 @@ } #wpadminbar ul li:last-child, -#wpadminbar ul li:last-child a { +#wpadminbar ul li:last-child .ab-item { border-right: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } /** @@ -349,11 +367,11 @@ /** * Search */ -#wpadminbar #wp-admin-bar-search a { +#wpadminbar #wp-admin-bar-search .ab-item { padding: 0; } -#wpadminbar .quicklinks .admin-bar-search:hover { +#wpadminbar #wp-admin-bar-search .ab-item { /* default background */ background: transparent; } @@ -429,15 +447,16 @@ /** * WP Logo item */ -#wpadminbar .wp-admin-bar-logo > a { - padding-left: 24px; - background: url(../images/wp-logo-white.png) no-repeat 13px 6px; +#wpadminbar .ab-wp-logo { + display: block; + height: 28px; + width: 16px; + background: url(../images/wp-logo-white.png) no-repeat 0 50%; } -#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.nojs #wp-admin-bar-wp-logo:hover .ab-wp-logo, +#wpadminbar #wp-admin-bar-wp-logo.hover .ab-wp-logo { + background: url(../images/wp-logo-dark.png) no-repeat 0 50%; } /** diff --git a/wp-includes/js/admin-bar.dev.js b/wp-includes/js/admin-bar.dev.js index 4d015a29e1..b64c983eae 100644 --- a/wp-includes/js/admin-bar.dev.js +++ b/wp-includes/js/admin-bar.dev.js @@ -23,8 +23,8 @@ if ( typeof(jQuery) != 'undefined' ) { }).focus().select(); }); - $('.ab-top-menu > li > a').bind('focus.adminbar', function(){ - $(this).parent().addClass('hover').find('a').each(function(i, el){ + $('.ab-top-menu > li > .ab-item').bind('focus.adminbar', function(){ + $(this).parent().addClass('hover').find('.ab-item').each(function(i, el){ var node = $(el), tab = node.attr('tabindex'); if ( tab ) node.attr('tabindex', '0').attr('tabindex', tab); @@ -33,16 +33,16 @@ if ( typeof(jQuery) != 'undefined' ) { var t = $(this); setTimeout(function(){ - if ( !t.siblings('div').find('a:focus').length ) + if ( !t.siblings('div').find('.ab-item:focus').length ) t.parent().removeClass('hover'); }, 200); }); - $('.ab-top-menu li ul li a').bind('blur.adminbar', function(){ + $('.ab-top-menu li ul li .ab-item').bind('blur.adminbar', function(){ var top = $(this).parents('li.menupop'); setTimeout(function(){ - if ( !top.find('a:focus').length ) + if ( !top.find('.ab-item:focus').length ) top.removeClass('hover'); }, 150); }); diff --git a/wp-includes/js/admin-bar.js b/wp-includes/js/admin-bar.js index 1fb459ada9..086ceb2d42 100644 --- a/wp-includes/js/admin-bar.js +++ b/wp-includes/js/admin-bar.js @@ -1 +1 @@ -if(typeof(jQuery)!="undefined"){if(typeof(jQuery.fn.hoverIntent)=="undefined"){(function(b){b.fn.hoverIntent=function(p,r){var g={sensitivity:7,interval:100,timeout:0};g=b.extend(g,r?{over:p,out:r}:p);var a,f,t,v;var u=function(c){a=c.pageX;f=c.pageY};var w=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);if((Math.abs(t-a)+Math.abs(v-f)) li > a").bind("focus.adminbar",function(){a(this).parent().addClass("hover").find("a").each(function(b,d){var e=a(d),c=e.attr("tabindex");if(c){e.attr("tabindex","0").attr("tabindex",c)}})}).bind("blur.adminbar",function(){var b=a(this);setTimeout(function(){if(!b.siblings("div").find("a:focus").length){b.parent().removeClass("hover")}},200)});a(".ab-top-menu li ul li a").bind("blur.adminbar",function(){var b=a(this).parents("li.menupop");setTimeout(function(){if(!b.find("a:focus").length){b.removeClass("hover")}},150)})})}else{(function(i,k){var c=function(n,m,d){if(n.addEventListener){n.addEventListener(m,d,false)}else{if(n.attachEvent){n.attachEvent("on"+m,function(){return d.call(n,window.event)})}}},e,f=new RegExp("\\bhover\\b","g"),a=[],j=new RegExp("\\bselected\\b","g"),g=function(m){var d=a.length;while(d--){if(a[d]&&m==a[d][1]){return a[d][0]}}return false},h=function(s){var n,d,q,m,p,r,u=[],o=0;while(s&&s!=e&&s!=i){if("LI"==s.nodeName.toUpperCase()){u[u.length]=s;d=g(s);if(d){clearTimeout(d)}s.className=s.className?(s.className.replace(f,"")+" hover"):"hover";m=s}s=s.parentNode}if(m&&m.parentNode){p=m.parentNode;if(p&&"UL"==p.nodeName.toUpperCase()){n=p.childNodes.length;while(n--){r=p.childNodes[n];if(r!=m){r.className=r.className?r.className.replace(j,""):""}}}}n=a.length;while(n--){q=false;o=u.length;while(o--){if(u[o]==a[n][1]){q=true}}if(!q){a[n][1].className=a[n][1].className?a[n][1].className.replace(f,""):""}}},l=function(d){while(d&&d!=e&&d!=i){if("LI"==d.nodeName.toUpperCase()){(function(m){var n=setTimeout(function(){m.className=m.className?m.className.replace(f,""):""},500);a[a.length]=[n,m]})(d)}d=d.parentNode}},b=function(p){var n,d,o,m=p.target||p.srcElement;while(true){if(!m||m==i||m==e){return}if(m.id&&m.id=="wp-admin-bar-get-shortlink"){break}m=m.parentNode}if(p.preventDefault){p.preventDefault()}p.returnValue=false;if(-1==m.className.indexOf("selected")){m.className+=" selected"}for(n=0,d=m.childNodes.length;n li > .ab-item").bind("focus.adminbar",function(){a(this).parent().addClass("hover").find(".ab-item").each(function(b,d){var e=a(d),c=e.attr("tabindex");if(c){e.attr("tabindex","0").attr("tabindex",c)}})}).bind("blur.adminbar",function(){var b=a(this);setTimeout(function(){if(!b.siblings("div").find(".ab-item:focus").length){b.parent().removeClass("hover")}},200)});a(".ab-top-menu li ul li .ab-item").bind("blur.adminbar",function(){var b=a(this).parents("li.menupop");setTimeout(function(){if(!b.find(".ab-item:focus").length){b.removeClass("hover")}},150)})})}else{(function(i,k){var c=function(n,m,d){if(n.addEventListener){n.addEventListener(m,d,false)}else{if(n.attachEvent){n.attachEvent("on"+m,function(){return d.call(n,window.event)})}}},e,f=new RegExp("\\bhover\\b","g"),a=[],j=new RegExp("\\bselected\\b","g"),g=function(m){var d=a.length;while(d--){if(a[d]&&m==a[d][1]){return a[d][0]}}return false},h=function(s){var n,d,q,m,p,r,u=[],o=0;while(s&&s!=e&&s!=i){if("LI"==s.nodeName.toUpperCase()){u[u.length]=s;d=g(s);if(d){clearTimeout(d)}s.className=s.className?(s.className.replace(f,"")+" hover"):"hover";m=s}s=s.parentNode}if(m&&m.parentNode){p=m.parentNode;if(p&&"UL"==p.nodeName.toUpperCase()){n=p.childNodes.length;while(n--){r=p.childNodes[n];if(r!=m){r.className=r.className?r.className.replace(j,""):""}}}}n=a.length;while(n--){q=false;o=u.length;while(o--){if(u[o]==a[n][1]){q=true}}if(!q){a[n][1].className=a[n][1].className?a[n][1].className.replace(f,""):""}}},l=function(d){while(d&&d!=e&&d!=i){if("LI"==d.nodeName.toUpperCase()){(function(m){var n=setTimeout(function(){m.className=m.className?m.className.replace(f,""):""},500);a[a.length]=[n,m]})(d)}d=d.parentNode}},b=function(p){var n,d,o,m=p.target||p.srcElement;while(true){if(!m||m==i||m==e){return}if(m.id&&m.id=="wp-admin-bar-get-shortlink"){break}m=m.parentNode}if(p.preventDefault){p.preventDefault()}p.returnValue=false;if(-1==m.className.indexOf("selected")){m.className+=" selected"}for(n=0,d=m.childNodes.length;nadd( '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, '20111114', 1 ); + $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20111117', 1 ); $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110929', 1 ); $scripts->localize( 'wplink', 'wpLinkL10n', array( @@ -453,7 +453,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(), '20111117' ); + $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20111117a' ); $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(), '20111114' ); $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array(), '20111114' );