From a071a3a1df87a934bbe90c27df8dd8dc567576bc Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 11 Nov 2010 20:02:52 +0000 Subject: [PATCH] Admin bar fixes. Props ocean90. see #14772 git-svn-id: http://svn.automattic.com/wordpress/trunk@16310 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/admin-bar.php | 14 ++++----- wp-includes/css/admin-bar-rtl.css | 2 +- wp-includes/css/admin-bar-rtl.dev.css | 43 ++------------------------- wp-includes/css/admin-bar.css | 2 +- wp-includes/css/admin-bar.dev.css | 33 +++++--------------- 5 files changed, 18 insertions(+), 76 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index f4a18a9c5a..096b0bb2d9 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -110,7 +110,7 @@ function wp_admin_bar_my_account_menu() { function wp_admin_bar_my_sites_menu() { global $wpdb, $wp_admin_bar; - /* Add the 'My Dashboards' menu if the user has more than one site. */ + /* Add the 'My Sites' menu if the user has more than one site. */ if ( count( $wp_admin_bar->user->blogs ) <= 1 ) return; @@ -124,13 +124,13 @@ function wp_admin_bar_my_sites_menu() { $blavatar = '' . esc_attr__( 'Blavatar' ) . ''; $marker = ''; - if ( strlen($blog->blogname) > 35 ) + if ( strlen($blog->blogname) > 15 ) $marker = '...'; if ( empty( $blog->blogname ) ) $blogname = $blog->domain; else - $blogname = substr( $blog->blogname, 0, 35 ) . $marker; + $blogname = substr( $blog->blogname, 0, 15 ) . $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), ) ); @@ -220,14 +220,13 @@ function wp_admin_bar_comments_menu() { $awaiting_mod = wp_count_comments(); $awaiting_mod = $awaiting_mod->moderated; - // @todo styling for awaiting mod count. Don't show count if zero? - $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "" . number_format_i18n($awaiting_mod) . "" ), 'href' => admin_url('edit-comments.php') ) ); + $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "" . number_format_i18n($awaiting_mod) . "" ), 'href' => admin_url('edit-comments.php') ) ); } function wp_admin_bar_appearance_menu() { global $wp_admin_bar; - if ( !current_user_can('switch themes') ) + if ( !current_user_can('switch_themes') ) return; $wp_admin_bar->add_menu( array( 'id' => 'appearance', 'title' => __('Appearance'), 'href' => admin_url('themes.php') ) ); @@ -276,9 +275,8 @@ function wp_admin_bar_updates_menu() { $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : ''; - $update_title = sprintf( __('Updates %s'), "" . number_format_i18n($update_count) . "" ); + $update_title = sprintf( __('Updates %s'), "" . number_format_i18n($update_count) . "" ); - // @todo styling for awaiting mod count. Don't show count if zero? $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) ); } diff --git a/wp-includes/css/admin-bar-rtl.css b/wp-includes/css/admin-bar-rtl.css index 1258623a4d..d831910b0c 100644 --- a/wp-includes/css/admin-bar-rtl.css +++ b/wp-includes/css/admin-bar-rtl.css @@ -1 +1 @@ -#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks>ul>li>a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:hover>a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover>ul,#wpadminbar .menupop li.hover>ul{margin-left:-100%;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .menupop ul{right:0;width:100%;min-width:150px;}#wpadminbar .ab-my-account ul{width:200px;}#wpadminbar .ab-my-blogs ul{width:300px;}#wpadminbar .ab-my-blogs ul ul{width:200px;}#wpadminbar .ab-bloginfo ul{width:200px;}#wpadminbar .ab-subscribe ul{width:150px;}#wpadminbar .menupop ul li{width:auto;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin>a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-me>a:hover,#wpadminbar li.ab-blog>a:hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.7em!important;}#wpadminbar li.ab-my-account>ul,#wpadminbar li.ab-bloginfo>ul{right:-7px;left:auto;}#wpadminbar ul li a strong.count{margin-right:5px;margin-left:0;position:static;}.adminbar-input{background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat!important;float:right!important;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover>ul,#wpadminbar #admin-bar-micro ul li.hover>ul{left:auto;right:100%;} \ No newline at end of file +#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks>ul>li>a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:hover>a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover>ul,#wpadminbar .menupop li.hover>ul{margin-right:100%;margin-top:-28px;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .menupop ul li{width:auto;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin>a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-blog>a:hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.7em!important;}.adminbar-input{background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat!important;float:right!important;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover>ul,#wpadminbar #admin-bar-micro ul li.hover>ul{left:auto;right:100%;} \ No newline at end of file diff --git a/wp-includes/css/admin-bar-rtl.dev.css b/wp-includes/css/admin-bar-rtl.dev.css index 876fa5f598..e3008ae6c1 100644 --- a/wp-includes/css/admin-bar-rtl.dev.css +++ b/wp-includes/css/admin-bar-rtl.dev.css @@ -37,7 +37,8 @@ #wpadminbar .menupop li:hover > ul, #wpadminbar .menupop li.hover > ul { - margin-left:-100%; + margin-right:100%; + margin-top:-28px; } #wpadminbar .menupop a > span { @@ -51,32 +52,6 @@ padding-left:1.5em; } -#wpadminbar .menupop ul { - right: 0; - width:100%; - min-width:150px; -} - -#wpadminbar .ab-my-account ul { - width:200px; -} - -#wpadminbar .ab-my-blogs ul { - width:300px; -} - -#wpadminbar .ab-my-blogs ul ul { - width:200px; -} - -#wpadminbar .ab-bloginfo ul { - width:200px; -} - -#wpadminbar .ab-subscribe ul { - width:150px; -} - #wpadminbar .menupop ul li { width:auto; } @@ -157,7 +132,6 @@ padding: 0 0.7em 0 1.15em; } -#wpadminbar li.ab-me > a:hover, #wpadminbar li.ab-blog > a:hover { background-position: 33% 59.8%; } @@ -168,19 +142,6 @@ padding-right: 0.7em !important; } -#wpadminbar li.ab-my-account > ul, -#wpadminbar li.ab-bloginfo > ul { - right: -7px; - left:auto; -} - - -#wpadminbar ul li a strong.count { - margin-right: 5px; - margin-left: 0; - position:static; -} - .adminbar-input { background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat !important; float:right !important; diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index 6de4554ff8..e9d22923ae 100644 --- a/wp-includes/css/admin-bar.css +++ b/wp-includes/css/admin-bar.css @@ -1 +1 @@ -#wpadminbar{direction:ltr;background:#666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;color:#ddd;font:12px Arial,Helvetica,sans-serif;height:28px;left:0;margin:0;position:fixed;top:0;width:100%;z-index:99999;min-width:960px;}#wpadminbar ul,#wpadminbar ul li{position:relative;z-index:99999;}#wpadminbar ul li img{vertical-align:middle!important;margin-right:8px!important;border:none!important;padding:0!important;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks>ul>li:hover>a{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{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-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;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 .menupop ul li a span#awaiting-mod{display:inline;background:#aaa;color:#fff;padding:1px 5px;font-size:10px;font-family:verdana;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#wpadminbar .menupop ul li a:hover span#awaiting-mod{background:#fff;color:#888;}#wpadminbar .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);background:#fff;display:none;position:absolute;border:1px solid #dfdfdf;border-top:none!important;float:none;}html>body #wpadminbar .menupop ul{background:rgba(255,255,255,0.97);border-color:rgba(0,0,0,0.1);}#wpadminbar .menupop.ab-my-account ul,#wpadminbar .menupop.ab-my-dash ul,#wpadminbar .menupop.ab-new-post ul{min-width:140px;}#wpadminbar .menupop li{float:none;margin:0;padding:0;background-image:none;}#wpadminbar .quicklinks a{border:none;color:#ddd!important;height:28px;text-shadow:#555 0 -1px 0;display:block;font:13px Arial,Helvetica,sans-serif;font-weight:normal;letter-spacing:normal;padding:0 .85em;line-height:28px;text-decoration:none!important;}#wpadminbar .quicklinks li ul li a{width:160px;}#wpadminbar .quicklinks a:hover{text-shadow:#333 0 -1px 0;}#wpadminbar li.ab-sadmin{float:right;background:#555;}#wpadminbar li.ab-sadmin ul{right:0;float:right;}#wpadminbar li.ab-sadmin>a{font-size:11px!important;padding:0 7px!important;border:none!important;border-left:1px solid #666!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{right:0;float:right;text-align:left;width:100%;}#wpadminbar li.ab-sadmin ul li a{padding-left:1.75em;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 0 101.8% no-repeat;padding-left:1.25em;margin-left:-1.25em;line-height:28px;padding-right:0!important;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#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 0 -1px 0;}#wpadminbar li li:hover>a{color:#fff!important;}.quicklinks ul{list-style:none;margin:0;padding:0;text-align:left;}.quicklinks ul li{float:left;margin:0;}#adminbarsearch{float:right;}#adminbarsearch{height:18px;padding:3px;}#adminbarsearch *{color:#555;font-size:12px;}#adminbarsearch label,#adminbarsearch a{height:28px;color:#ccc;display:block;float:left;padding:3px 4px;text-shadow:0 -1px 0 #444;}#adminbarsearch a{text-decoration:underline;}#adminbarsearch a:hover{color:#fff;}#wpadminbar li.ab-me:hover,#wpadminbar li.ab-blog:hover{background:none;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{line-height:18px!important;border:none!important;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;height:28px;padding:0 1.15em 0 .7em;}#wpadminbar li.ab-blog>a:hover{background-position:67% 59.8%;}#wpadminbar li.ab-me img.avatar,#wpadminbar li.ab-blog img.avatar{margin:4px 0 0 0!important;vertical-align:middle;background:#eee;width:16px!important;height:16px!important;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-left:none!important;padding-left:.7em!important;margin-top:0!important;}#wpadminbar li.ab-my-account>ul,#wpadminbar li.ab-bloginfo>ul{left:-7px;}#wpadminbar ul li img{width:16px!important;height:16px!important;}#wpadminbar ul li a strong.count{text-shadow:none;background:#ddd;color:#555;margin-left:5px;padding:1px 6px;top:-1px;position:relative;font-size:9px;-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px;font-weight:normal;}#wpadminbar #adminbar-search{line-height:normal!important;width:140px!important;margin-top:0!important;}.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-right:3px!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;outline:none;text-shadow:0 1px 0 #fff;}button.adminbar-button{position:relative;border:0;cursor:pointer;overflow:visible;margin:0!important;float:left;background:url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;padding:0 14px 0 0;text-align:center;}button.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:0 1px 0 #eee!important;}button.adminbar-button:active{background-position:right -184px!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:hover span{color:#000!important;}button.adminbar-button:active span{background-position:left -146px!important;}button.adminbar-button::-moz-focus-inner{border:none;}@media screen and(-webkit-min-device-pixel-ratio:0){button.adminbar-button span{margin-top:-1px;}}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .menupop ul li a:hover,* html #wpadminbar .myaccount a,* html .quicklinks a:hover,* html #wpadminbar .menupop:hover{background-image:none!important;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #adminbarsearch-wrap{position:absolute;top:0;}* html #wpadminbar ul,* html #wpadminbar ul li{zoom:1;}* html #wpadminbar .myaccount a{margin-left:0!important;padding-left:12px!important;} \ No newline at end of file +#wpadminbar{direction:ltr;background:#666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;color:#ddd;font:12px Arial,Helvetica,sans-serif;height:28px;left:0;margin:0;position:fixed;top:0;width:100%;z-index:99999;min-width:960px;}#wpadminbar ul,#wpadminbar ul li{position:relative;z-index:99999;}#wpadminbar ul li img{vertical-align:middle!important;margin-right:8px!important;border:none!important;padding:0!important;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks>ul>li:hover>a{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{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-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;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:#aaa;color:#fff;padding:1px 5px;font-size:10px;font-family:verdana;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#wpadminbar ul li a:hover span#ab-awaiting-mod,#wpadminbar ul li a:hover span#ab-updates{background:#fff;color:#888;}#wpadminbar ul li a span#ab-awaiting-mod.count-0{display:none;}#wpadminbar .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);background:#fff;display:none;position:absolute;border:1px solid #dfdfdf;border-top:none!important;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{float:none;margin:0;padding:0;background-image:none;}#wpadminbar .quicklinks a{border:none;color:#ddd!important;height:28px;text-shadow:#555 0 -1px 0;display:block;font:13px Arial,Helvetica,sans-serif;font-weight:normal;letter-spacing:normal;padding:0 .85em;line-height:28px;text-decoration:none!important;}#wpadminbar .quicklinks li ul li a{width:160px;}#wpadminbar .quicklinks a:hover{text-shadow:#333 0 -1px 0;}#wpadminbar li.ab-sadmin{float:right;background:#555;}#wpadminbar li.ab-sadmin ul{right:0;float:right;}#wpadminbar li.ab-sadmin>a{font-size:11px!important;padding:0 7px!important;border:none!important;border-left:1px solid #666!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{right:0;float:right;text-align:left;width:100%;}#wpadminbar li.ab-sadmin ul li a{padding-left:1.75em;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 0 101.8% no-repeat;padding-left:1.25em;margin-left:-1.25em;line-height:28px;padding-right:0!important;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#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 0 -1px 0;}#wpadminbar li li:hover>a{color:#fff!important;}.quicklinks ul{list-style:none;margin:0;padding:0;text-align:left;}.quicklinks ul li{float:left;margin:0;}#adminbarsearch{float:right;}#adminbarsearch{height:18px;padding:3px;}#adminbarsearch *{color:#555;font-size:12px;}#adminbarsearch label,#adminbarsearch a{height:28px;color:#ccc;display:block;float:left;padding:3px 4px;text-shadow:0 -1px 0 #444;}#adminbarsearch a{text-decoration:underline;}#adminbarsearch a:hover{color:#fff;}#wpadminbar li.ab-me:hover,#wpadminbar li.ab-blog:hover{background:none;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{line-height:18px!important;border:none!important;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;height:28px;padding:0 1.15em 0 .7em;}#wpadminbar li.ab-blog>a:hover{background-position:67% 59.8%;}#wpadminbar li.ab-me img.avatar,#wpadminbar li.ab-blog img.avatar{margin:4px 0 0 0!important;vertical-align:middle;background:#eee;width:16px!important;height:16px!important;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-left:none!important;padding-left:.7em!important;margin-top:0!important;}#wpadminbar ul li img{width:16px!important;height:16px!important;}#wpadminbar #adminbar-search{line-height:normal!important;width:140px!important;margin-top:0!important;}.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-right:3px!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;outline:none;text-shadow:0 1px 0 #fff;}button.adminbar-button{position:relative;border:0;cursor:pointer;overflow:visible;margin:0!important;float:left;background:url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;padding:0 14px 0 0;text-align:center;}button.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:0 1px 0 #eee!important;}button.adminbar-button:active{background-position:right -184px!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:hover span{color:#000!important;}button.adminbar-button:active span{background-position:left -146px!important;}button.adminbar-button::-moz-focus-inner{border:none;}@media screen and(-webkit-min-device-pixel-ratio:0){button.adminbar-button span{margin-top:-1px;}}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .menupop ul li a:hover,* html #wpadminbar .myaccount a,* html .quicklinks a:hover,* html #wpadminbar .menupop:hover{background-image:none!important;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #adminbarsearch-wrap{position:absolute;top:0;}* html #wpadminbar ul,* html #wpadminbar ul li{zoom:1;}* html #wpadminbar .myaccount a{margin-left:0!important;padding-left:12px!important;} \ 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 87af151b5c..66a29f5ab7 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -72,7 +72,8 @@ padding-right:1.5em; line-height: 28px; } -#wpadminbar .menupop ul li a span#awaiting-mod { +#wpadminbar ul li a span#ab-awaiting-mod, +#wpadminbar ul li a span#ab-updates { display: inline; background: #aaa; color: #fff; @@ -83,10 +84,14 @@ -webkit-border-radius: 5px; border-radius: 5px; } -#wpadminbar .menupop ul li a:hover span#awaiting-mod { +#wpadminbar ul li a:hover span#ab-awaiting-mod, +#wpadminbar ul li a:hover span#ab-updates { background: #fff; color: #888; } +#wpadminbar ul li a span#ab-awaiting-mod.count-0 { + display: none; +} #wpadminbar .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); @@ -101,11 +106,6 @@ html>body #wpadminbar .menupop ul { background:rgba(255,255,255,0.97); border-color:rgba(0,0,0,0.1); } -#wpadminbar .menupop.ab-my-account ul, -#wpadminbar .menupop.ab-my-dash ul, -#wpadminbar .menupop.ab-new-post ul { - min-width:140px; -} #wpadminbar .menupop li { float:none; margin:0; @@ -245,29 +245,12 @@ html>body #wpadminbar .menupop ul { padding-left: 0.7em !important; margin-top: 0 !important; } -#wpadminbar li.ab-my-account > ul, #wpadminbar li.ab-bloginfo > ul { - left: -7px; -} + #wpadminbar ul li img { width: 16px !important; height: 16px !important; } -#wpadminbar ul li a strong.count { - text-shadow: none; - background: #ddd; - color: #555; - margin-left: 5px; - padding: 1px 6px; - top: -1px; - position: relative; - font-size: 9px; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; - font-weight: normal; -} - #wpadminbar #adminbar-search { line-height:normal !important; width:140px !important;