diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 24137f3958..dd026815c3 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -221,7 +221,8 @@ function wp_admin_bar_comments_menu() { $awaiting_mod = wp_count_comments(); $awaiting_mod = $awaiting_mod->moderated; - $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "" . number_format_i18n($awaiting_mod) . "" ), 'href' => admin_url('edit-comments.php') ) ); + $awaiting_mod = $awaiting_mod ? "add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), $awaiting_mod ), 'href' => admin_url('edit-comments.php') ) ); } function wp_admin_bar_appearance_menu() { @@ -276,7 +277,9 @@ 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 = ""; + $update_title .= sprintf( __('Updates %s'), "" . number_format_i18n($update_count) . '' ); + $update_title .= ''; $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' ); diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index b759f3b306..84e4588f89 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 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;}#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{overflow:hidden;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 +#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:#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{-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{overflow:hidden;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;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 52f67430c2..a7f9be943f 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -1,15 +1,15 @@ #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; + 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, @@ -37,39 +37,39 @@ 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; + 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; + display: block; } #wpadminbar .menupop li:hover > ul, #wpadminbar .menupop li.hover > ul { - margin-left:100%; - margin-top:-28px; + margin-left: 100%; + margin-top: -28px; } #wpadminbar .menupop ul li a { - color:#555 !important; - text-shadow:none; - font-weight:normal; - white-space:nowrap; + 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; + 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; + 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, @@ -83,57 +83,52 @@ -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: #888; -} -#wpadminbar span.update-count { - text-shadow: none; -} -#wpadminbar ul li a span#ab-awaiting-mod.count-0 { - display: none; + color: #000; } #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; + -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); + 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; + 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; - font-weight:normal; - letter-spacing:normal; - padding:0 0.85em; - line-height:28px; - text-decoration:none !important; + border: none; + color: #ddd !important; + height: 28px; + text-shadow: #555 0px -1px 0px; + display: block; + font: 13px Arial, Helvetica, sans-serif; + font-weight: normal; + letter-spacing: normal; + padding: 0 0.85em; + line-height: 28px; + text-decoration: none !important; } #wpadminbar .quicklinks li ul li a { - overflow:hidden; - width:160px; + overflow: hidden; + width: 160px; } #wpadminbar .quicklinks a:hover { - text-shadow:#333 0px -1px 0px; + text-shadow: #333 0px -1px 0px; } #wpadminbar li.ab-sadmin { @@ -165,7 +160,7 @@ html>body #wpadminbar .menupop ul { 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; + 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; @@ -176,60 +171,58 @@ html>body #wpadminbar .menupop ul { background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x; } #wpadminbar li li:hover { - color:#fff !important; + 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 li li:hover > a { - color:#fff !important; + color: #fff !important; } .quicklinks ul { - list-style:none; - margin:0; - padding:0; - text-align:left; + list-style: none; + margin: 0; + padding: 0; + text-align: left; } .quicklinks ul li { - float:left; - margin:0; + float: left; + margin: 0; } #adminbarsearch { - float:right; -} -#adminbarsearch { + float: right; height: 18px; padding: 3px; } #adminbarsearch * { color: #555; - font-size:12px; + font-size: 12px; } #adminbarsearch label, #adminbarsearch a { height: 28px; color: #ccc; - display:block; - float:left; - padding:3px 4px; - text-shadow:0px -1px 0px #444; + display: block; + float: left; + padding: 3px 4px; + text-shadow: 0px -1px 0px #444; } #adminbarsearch a { - text-decoration:underline; + text-decoration: underline; } #adminbarsearch a:hover { - color:#fff; + color: #fff; } #wpadminbar li.ab-me:hover, #wpadminbar li.ab-blog:hover { - background:none; + 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; + background: url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat; height: 28px; padding: 0 1.15em 0 0.7em; } @@ -256,62 +249,62 @@ html>body #wpadminbar .menupop ul { } #wpadminbar #adminbar-search { - line-height:normal !important; - width:140px !important; - margin-top:0px !important; + line-height: normal !important; + width: 140px !important; + margin-top: 0px !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; + 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; + 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:0px 1px 0px #eee !important; + 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; } button.adminbar-button:active { - background-position:right -184px !important; - text-shadow:0px 1px 0px #eee !important; + background-position: right -184px !important; + text-shadow: 0px 1px 0px #eee !important; } button.adminbar-button:hover span { - color:#000 !important; + color: #000 !important; } button.adminbar-button:active span { - background-position:left -146px !important; + background-position: left -146px !important; } button.adminbar-button::-moz-focus-inner { - border:none; + border: none; } -@media screen and (-webkit-min-device-pixel-ratio:0) { +@media screen and (-webkit-min-device-pixel-ratio: 0) { button.adminbar-button span { margin-top: -1px; } @@ -328,31 +321,31 @@ button.adminbar-button::-moz-focus-inner { * html #wpadminbar .myaccount a, * html .quicklinks a:hover, * html #wpadminbar .menupop:hover { - background-image: none !important; + background-image: none !important; } * html #wpadminbar { - overflow:hidden; - position:absolute; + overflow: hidden; + position: absolute; } * html #wpadminbar .quicklinks ul li a { - float:left; + float: left; } * html #adminbarsearch-wrap { - position:absolute; - top:0; + position: absolute; + top: 0; } * html #wpadminbar ul, * html #wpadminbar ul li { - zoom:1; + zoom: 1; } * html #wpadminbar .myaccount a { - margin-left:0 !important; - padding-left:12px !important; + margin-left: 0 !important; + padding-left: 12px !important; } /** * End IE 6-targeted rules diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 21a118bb4e..c4fc54f95c 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -516,7 +516,7 @@ function wp_default_styles( &$styles ) { $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( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' ); - $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101201' ); + $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101208' ); $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101119' ); $styles->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/css/wplink$suffix.css", array(), '20101206' );