From 4b48cc16246b262dab72b29c5d7890a2e69b387b Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 10 Dec 2010 04:01:16 +0000 Subject: [PATCH] Admin bar CSS cleaning. props ocean90, see #15308. git-svn-id: http://svn.automattic.com/wordpress/trunk@16852 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/css/admin-bar-rtl.css | 2 +- wp-includes/css/admin-bar-rtl.dev.css | 134 ++++++++------------------ wp-includes/css/admin-bar.css | 2 +- wp-includes/css/admin-bar.dev.css | 113 +++++++++------------- wp-includes/script-loader.php | 2 +- 5 files changed, 88 insertions(+), 165 deletions(-) diff --git a/wp-includes/css/admin-bar-rtl.css b/wp-includes/css/admin-bar-rtl.css index d831910b0c..bee391e5ce 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-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 +#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: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;}#wpadminbar li.ab-me>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{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;} \ 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 e3008ae6c1..0874aa8411 100644 --- a/wp-includes/css/admin-bar-rtl.dev.css +++ b/wp-includes/css/admin-bar-rtl.dev.css @@ -1,15 +1,17 @@ #wpadminbar { - background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x; - direction:rtl; + 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; + 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; @@ -32,103 +34,56 @@ #wpadminbar .avatar { margin: -3px 0 0 5px !important; - float:none; + float: none; } #wpadminbar .menupop li:hover > ul, #wpadminbar .menupop li.hover > ul { - margin-right:100%; - margin-top:-28px; + 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; + 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; + 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; + 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; + text-align: right; } .quicklinks ul li { - float:right; + float: right; } #adminbarsearch { - display:none; + 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; +#wpadminbar li.ab-me > a { + background: url(../images/admin-bar-sprite-rtl.png?d=08102010) 0% 59.8% no-repeat; padding: 0 0.7em 0 1.15em; } @@ -136,49 +91,36 @@ background-position: 33% 59.8%; } -#wpadminbar li.ab-my-account a, -#wpadminbar li.ab-bloginfo a { +#wpadminbar li.ab-my-account a { border-right: none !important; padding-right: 0.7em !important; } .adminbar-input { - background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat !important; - float:right !important; + 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; + 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; + 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; + 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; + background-position: left -184px !important; } + button.adminbar-button:active span { - background-position:right -146px !important; + background-position: right -146px !important; } -/** - * Super admin styling - */ -#querylist { - direction: ltr; -} - -#wpadminbar #admin-bar-micro ul li:hover > ul, -#wpadminbar #admin-bar-micro ul li.hover > ul { - left: auto; - right: 100%; -} - -/** -* End super admin styling -*/ diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index bba2455e0d..a220ee2c22 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{background:none;list-style:none;margin:0;padding:0;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: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;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{background:none;list-style:none;margin:0;padding:0;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: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;}#wpadminbar li.ab-me:hover{background:none;}#wpadminbar li.ab-me>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{margin:4px 0 0 0!important;vertical-align:middle;background:#eee;width:16px!important;height:16px!important;}#wpadminbar li.ab-my-account 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: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;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 .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;} \ 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 75ec6246ab..ef92943978 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -12,6 +12,7 @@ z-index: 99999; min-width: 960px; } + #wpadminbar ul, #wpadminbar ul li { background: none; @@ -21,25 +22,31 @@ 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; @@ -48,34 +55,40 @@ 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; @@ -89,11 +102,13 @@ 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); @@ -104,16 +119,19 @@ 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; @@ -127,121 +145,80 @@ html>body #wpadminbar .menupop ul { line-height: 28px; text-decoration: none !important; } + #wpadminbar .quicklinks li ul li a { overflow: hidden; width: 160px; } + #wpadminbar .quicklinks a:hover { text-shadow: #333 0px -1px 0px; } -#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 0px -1px 0px; } + #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: 0px -1px 0px #444; -} -#adminbarsearch a { - text-decoration: underline; -} -#adminbarsearch a:hover { - color: #fff; -} -#wpadminbar li.ab-me:hover, -#wpadminbar li.ab-blog:hover { +#wpadminbar li.ab-me:hover { background: none; } -#wpadminbar li.ab-me > a, -#wpadminbar li.ab-blog > a { + +#wpadminbar li.ab-me > 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 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 { + +#wpadminbar li.ab-me 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 { + +#wpadminbar li.ab-my-account a { border-left: none !important; padding-left: 0.7em !important; margin-top: 0 !important; @@ -257,6 +234,7 @@ html>body #wpadminbar .menupop ul { width: 140px !important; margin-top: 0px !important; } + .adminbar-input { display: block !important; float: left !important; @@ -272,6 +250,7 @@ html>body #wpadminbar .menupop ul { outline: none; text-shadow: 0 1px 0 #fff; } + button.adminbar-button { position: relative; border: 0; @@ -283,6 +262,7 @@ button.adminbar-button { padding: 0 14px 0 0; text-align: center; } + button.adminbar-button span { position: relative; display: block; @@ -295,23 +275,29 @@ button.adminbar-button span { 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; } + 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; } + } @@ -319,10 +305,9 @@ button.adminbar-button::-moz-focus-inner { * IE 6-targeted rules */ -* html #wpadminbar, -* html #wpadminbar .menupop a span, -* html #wpadminbar .menupop ul li a:hover, -* html #wpadminbar .myaccount a, +* 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; @@ -342,15 +327,11 @@ button.adminbar-button::-moz-focus-inner { top: 0; } -* html #wpadminbar ul, +* html #wpadminbar ul, * html #wpadminbar ul li { zoom: 1; } -* html #wpadminbar .myaccount a { - 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 3bb70e0e0d..2d5da0c117 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(), '20101208b' ); + $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101209' ); $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' );