From 86e44f1050e49c781cb8a9e41c67df3e727e9f07 Mon Sep 17 00:00:00 2001 From: nacin Date: Sat, 11 Dec 2010 08:54:41 +0000 Subject: [PATCH] More admin bar styling improvements. Includes RTL fixes. Don't show redundant 'search' value. props ocean90, see #15308. git-svn-id: http://svn.automattic.com/wordpress/trunk@16875 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-admin-bar.php | 2 +- wp-includes/css/admin-bar-rtl.css | 2 +- wp-includes/css/admin-bar-rtl.dev.css | 90 +++++++++++---------------- wp-includes/css/admin-bar.css | 2 +- wp-includes/css/admin-bar.dev.css | 2 +- wp-includes/js/admin-bar.dev.js | 13 ---- wp-includes/js/admin-bar.js | 2 +- 7 files changed, 42 insertions(+), 71 deletions(-) diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index eb3da01dd..93ae46a16 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -100,7 +100,7 @@ class WP_Admin_Bar {
- +
diff --git a/wp-includes/css/admin-bar-rtl.css b/wp-includes/css/admin-bar-rtl.css index bee391e5c..d3eb9cc33 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: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 +#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 .quicklinks ul{text-align:right;}#wpadminbar .quicklinks ul li{float:right;}#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 .quicklinks li.ab-me a img.avatar{margin:5px -4px 0 2px;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-right:100%;margin-left:0;}#wpadminbar .quicklinks .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-right:0;padding-left:.8em;}#wpadminbar .quicklinks .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 .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar .quicklinks li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar .quicklinks .menupop li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;}#wpadminbar .quicklinks .menupop li a img.blavatar{margin-right:0;margin-left:8px;}#wpadminbar .quicklinks li.ab-me>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;}#wpadminbar .quicklinks li.ab-my-account>a{border-right:none;border-left:1px solid #686868;}#wpadminbar #adminbarsearch{float:left;}#wpadminbar #adminbarsearch .adminbar-input{background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat;float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;margin-right:0;margin-left:3px;}#wpadminbar #adminbarsearch .adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}#wpadminbar #adminbarsearch .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;}#wpadminbar #adminbarsearch .adminbar-button:active{background-position:left -184px;}#wpadminbar #adminbarsearch .adminbar-button:active span{background-position:right -146px;} \ 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 0874aa841..e06dd34a7 100644 --- a/wp-includes/css/admin-bar-rtl.dev.css +++ b/wp-includes/css/admin-bar-rtl.dev.css @@ -6,15 +6,12 @@ left: auto; } -#wpadminbar div, -#wpadminbar ul, -#wpadminbar ul li { - min-height: 0; +#wpadminbar .quicklinks ul { + text-align: right; } -#wpadminbar ul li img { - margin-left: 8px !important; - margin-right: 0 !important; +#wpadminbar .quicklinks ul li { + float: right; } #wpadminbar .quicklinks > ul > li > a { @@ -32,95 +29,82 @@ border-left-color: #686868; } -#wpadminbar .avatar { - margin: -3px 0 0 5px !important; - float: none; +#wpadminbar .quicklinks li.ab-me a img.avatar { + margin: 5px -4px 0 2px; } -#wpadminbar .menupop li:hover > ul, -#wpadminbar .menupop li.hover > ul { +#wpadminbar .quicklinks .menupop li:hover > ul, +#wpadminbar .quicklinks .menupop li.hover > ul { margin-right: 100%; - margin-top: -28px; + margin-left: 0; } -#wpadminbar .menupop a > span { +#wpadminbar .quicklinks .menupop a > span { background: url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat; + padding-right: 0; padding-left: .8em; } -#wpadminbar .menupop ul li a > span { +#wpadminbar .quicklinks .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 { +#wpadminbar .quicklinks 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; +#wpadminbar .quicklinks .menupop li:hover { + background: #888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x; } -.quicklinks ul { - text-align: right; +#wpadminbar .quicklinks .menupop li a img.blavatar { + margin-right: 0; + margin-left: 8px; } -.quicklinks ul li { - float: right; -} - -#adminbarsearch { - display: none; -} - -#wpadminbar li.ab-me > a { +#wpadminbar .quicklinks 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; } -#wpadminbar li.ab-blog > a:hover { - background-position: 33% 59.8%; +#wpadminbar .quicklinks li.ab-my-account > a { + border-right: none; + border-left: 1px solid #686868; } -#wpadminbar li.ab-my-account a { - border-right: none !important; - padding-right: 0.7em !important; +#wpadminbar #adminbarsearch { + float: left; } -.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; +#wpadminbar #adminbarsearch .adminbar-input { + background: #ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat; + float: right; + font-family: Tahoma, Arial, Helvetica, sans-serif; + margin-right: 0; + margin-left: 3px; } -button.adminbar-button { +#wpadminbar #adminbarsearch .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 { +#wpadminbar #adminbarsearch .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; + font-family: Tahoma, Arial, Helvetica, sans-serif; } -button.adminbar-button:active { - background-position: left -184px !important; +#wpadminbar #adminbarsearch .adminbar-button:active { + background-position: left -184px; } -button.adminbar-button:active span { - background-position: right -146px !important; +#wpadminbar #adminbarsearch .adminbar-button:active span { + background-position: right -146px; } - diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index 0b13e80e7..bb0238370 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 a,#wpadminbar a:hover{outline:none;border:none;text-decoration:none;}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar .quicklinks ul li{float:left;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks>ul>li:hover>a{border-left-color:#707070;}#wpadminbar .quicklinks a{color:#ddd;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;}#wpadminbar .quicklinks .menupop ul{-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);box-shadow:0 4px 8px rgba(0,0,0,0.1);background:#fff;background:rgba(255,255,255,0.97);display:none;position:absolute;border:1px solid #dfdfdf;border-top:none;float:none;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a{color:#555;text-shadow:none;font-weight:normal;white-space:nowrap;overflow:hidden;width:160px;}#wpadminbar .quicklinks .menupop ul li:hover>a{color:#fff;text-shadow:#666 0 -1px 0;}#wpadminbar .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .quicklinks li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#wpadminbar .quicklinks .menupop li:hover{background:#888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;}#wpadminbar .quicklinks .menupop a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;padding-right:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat;padding-right:1.5em;}#wpadminbar .quicklinks a span#ab-awaiting-mod,#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-awaiting-mod,#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .quicklinks li.ab-me a{border:none;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;}#wpadminbar .quicklinks li.ab-my-account a{border-left:none;}#wpadminbar .quicklinks li.ab-me:hover{background:none;}#wpadminbar .quicklinks li.ab-me a img.avatar{border:1px solid #999;margin:5px 2px 0 -4px;background:#eee;width:16px;height:16px;}#wpadminbar .quicklinks .menupop li a img.blavatar{vertical-align:middle;margin-right:8px;}#wpadminbar #adminbarsearch{float:right;height:18px;padding:3px;}#wpadminbar #adminbarsearch .adminbar-input{color:#555;width:140px;display:block;float:left;font:12px Arial,Helvetica,sans-serif;border:1px solid #626262;padding:2px 3px;margin:0 3px 0 0;background:#ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat;-webkit-border-radius:0;-khtml-border-radius:0;-moz-border-radius:0;border-radius:0;outline:none;text-shadow:0 1px 0 #fff;}#wpadminbar #adminbarsearch .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;outline:none;}#wpadminbar #adminbarsearch .adminbar-button span{position:relative;display:block;white-space:nowrap;height:19px;background:url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;padding:3px 0 0 14px;font:12px Arial,Helvetica,sans-serif;font-weight:bold;color:#444;text-shadow:0 1px 0 #eee;}#wpadminbar #adminbarsearch .adminbar-button:active{background-position:right -184px;text-shadow:0 1px 0 #eee;}#wpadminbar #adminbarsearch .adminbar-button:hover span{color:#000;}#wpadminbar #adminbarsearch .adminbar-button:active span{background-position:left -146px;}#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner{border:none;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .quicklinks li,* html #wpadminbar .quicklinks li:hover{background-image:none;} \ 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 a,#wpadminbar a:hover{outline:none;border:none;text-decoration:none;}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar .quicklinks ul li{float:left;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks>ul>li:hover>a{border-left-color:#707070;}#wpadminbar .quicklinks a{color:#ddd;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;}#wpadminbar .quicklinks .menupop ul{-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);box-shadow:0 4px 8px rgba(0,0,0,0.1);background:#fff;background:rgba(255,255,255,0.97);display:none;position:absolute;border:1px solid #dfdfdf;border-top:none;float:none;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a{color:#555;text-shadow:none;font-weight:normal;white-space:nowrap;overflow:hidden;width:160px;}#wpadminbar .quicklinks .menupop ul li:hover>a{color:#fff;text-shadow:#666 0 -1px 0;}#wpadminbar .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .quicklinks li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#wpadminbar .quicklinks .menupop li:hover{background:#888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;}#wpadminbar .quicklinks .menupop a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;padding-right:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat;padding-right:1.5em;}#wpadminbar .quicklinks a span#ab-awaiting-mod,#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-awaiting-mod,#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .quicklinks li.ab-me a{border:none;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;}#wpadminbar .quicklinks li.ab-my-account>a{border-left:none;}#wpadminbar .quicklinks li.ab-me:hover{background:none;}#wpadminbar .quicklinks li.ab-me a img.avatar{border:1px solid #999;margin:5px 2px 0 -4px;background:#eee;width:16px;height:16px;}#wpadminbar .quicklinks .menupop li a img.blavatar{vertical-align:middle;margin-right:8px;}#wpadminbar #adminbarsearch{float:right;height:18px;padding:3px;}#wpadminbar #adminbarsearch .adminbar-input{color:#555;width:140px;display:block;float:left;font:12px Arial,Helvetica,sans-serif;border:1px solid #626262;padding:2px 3px;margin:0 3px 0 0;background:#ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat;-webkit-border-radius:0;-khtml-border-radius:0;-moz-border-radius:0;border-radius:0;outline:none;text-shadow:0 1px 0 #fff;}#wpadminbar #adminbarsearch .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;outline:none;}#wpadminbar #adminbarsearch .adminbar-button span{position:relative;display:block;white-space:nowrap;height:19px;background:url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;padding:3px 0 0 14px;font:12px Arial,Helvetica,sans-serif;font-weight:bold;color:#444;text-shadow:0 1px 0 #eee;}#wpadminbar #adminbarsearch .adminbar-button:active{background-position:right -184px;text-shadow:0 1px 0 #eee;}#wpadminbar #adminbarsearch .adminbar-button:hover span{color:#000;}#wpadminbar #adminbarsearch .adminbar-button:active span{background-position:left -146px;}#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner{border:none;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .quicklinks li,* html #wpadminbar .quicklinks li:hover{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 d96d3658a..d89a617ab 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -149,7 +149,7 @@ background: url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat; } -#wpadminbar .quicklinks li.ab-my-account a { +#wpadminbar .quicklinks li.ab-my-account > a { border-left: none; } diff --git a/wp-includes/js/admin-bar.dev.js b/wp-includes/js/admin-bar.dev.js index e9eb3f480..637473491 100644 --- a/wp-includes/js/admin-bar.dev.js +++ b/wp-includes/js/admin-bar.dev.js @@ -101,7 +101,6 @@ addEvent(w, 'load', function() { var b = d.getElementsByTagName('body')[0], - s = d.getElementById('adminbar-search'); aB = d.getElementById('wpadminbar'); @@ -119,18 +118,6 @@ addEvent(aB, 'click', clickShortlink ); } - if ( s ) { - if ( '' == s.value ) - s.value = s.getAttribute('title'); - - s.onblur = function() { - this.value = '' == this.value ? this.getAttribute('title') : this.value; - } - s.onfocus = function() { - this.value = this.getAttribute('title') == this.value ? '' : this.value; - } - } - if ( w.location.hash ) w.scrollBy(0,-32); }); diff --git a/wp-includes/js/admin-bar.js b/wp-includes/js/admin-bar.js index 33dcec4ff..99984a28d 100644 --- a/wp-includes/js/admin-bar.js +++ b/wp-includes/js/admin-bar.js @@ -1 +1 @@ -(function(i,j){var c=function(m,l,d){if(m.addEventListener){m.addEventListener(l,d,false)}else{if(m.attachEvent){m.attachEvent("on"+l,function(){return d.call(m,window.event)})}}},e,f=new RegExp("\\bhover\\b","g"),a=[],g=function(l){var d=a.length;while(d--){if(a[d]&&l==a[d][1]){return a[d][0]}}return false},h=function(l){var m=[],p=0,o,d=a.length,n;while(l&&l!=e&&l!=i){if("LI"==l.nodeName.toUpperCase()){m[m.length]=l;o=g(l);if(o){clearTimeout(o)}l.className=l.className?(l.className.replace(f,"")+" hover"):"hover"}l=l.parentNode}while(d--){n=false;p=m.length;while(p--){if(m[p]==a[d][1]){n=true}}if(!n){a[d][1].className=a[d][1].className?a[d][1].className.replace(f,""):""}}},k=function(d){while(d&&d!=e&&d!=i){if("LI"==d.nodeName.toUpperCase()){(function(l){var m=setTimeout(function(){l.className=l.className?l.className.replace(f,""):""},500);a[a.length]=[m,l]})(d)}d=d.parentNode}},b=function(n){var m=n.target||n.srcElement,d,l;if("undefined"==typeof adminBarL10n){return}while(m&&m!=e&&m!=i&&(!m.className||-1==m.className.indexOf("ab-get-shortlink"))){m=m.parentNode}if(m&&m.className&&-1!=m.className.indexOf("ab-get-shortlink")){d=i.getElementsByTagName("link");if(!d.length){d=i.links}l=d.length;if(n.preventDefault){n.preventDefault()}n.returnValue=false;while(l--){if(d[l]&&"shortlink"==d[l].getAttribute("rel")){prompt(adminBarL10n.url,d[l].href);return false}}alert(adminBarL10n.noShortlink);return false}};c(j,"load",function(){var d=i.getElementsByTagName("body")[0],l=i.getElementById("adminbar-search");e=i.getElementById("wpadminbar");if(d&&e){d.appendChild(e);c(e,"mouseover",function(m){h(m.target||m.srcElement)});c(e,"mouseout",function(m){k(m.target||m.srcElement)});c(e,"click",b)}if(l){if(""==l.value){l.value=l.getAttribute("title")}l.onblur=function(){this.value=""==this.value?this.getAttribute("title"):this.value};l.onfocus=function(){this.value=this.getAttribute("title")==this.value?"":this.value}}if(j.location.hash){j.scrollBy(0,-32)}})})(document,window); \ No newline at end of file +(function(i,j){var c=function(m,l,d){if(m.addEventListener){m.addEventListener(l,d,false)}else{if(m.attachEvent){m.attachEvent("on"+l,function(){return d.call(m,window.event)})}}},e,f=new RegExp("\\bhover\\b","g"),a=[],g=function(l){var d=a.length;while(d--){if(a[d]&&l==a[d][1]){return a[d][0]}}return false},h=function(l){var m=[],p=0,o,d=a.length,n;while(l&&l!=e&&l!=i){if("LI"==l.nodeName.toUpperCase()){m[m.length]=l;o=g(l);if(o){clearTimeout(o)}l.className=l.className?(l.className.replace(f,"")+" hover"):"hover"}l=l.parentNode}while(d--){n=false;p=m.length;while(p--){if(m[p]==a[d][1]){n=true}}if(!n){a[d][1].className=a[d][1].className?a[d][1].className.replace(f,""):""}}},k=function(d){while(d&&d!=e&&d!=i){if("LI"==d.nodeName.toUpperCase()){(function(l){var m=setTimeout(function(){l.className=l.className?l.className.replace(f,""):""},500);a[a.length]=[m,l]})(d)}d=d.parentNode}},b=function(n){var m=n.target||n.srcElement,d,l;if("undefined"==typeof adminBarL10n){return}while(m&&m!=e&&m!=i&&(!m.className||-1==m.className.indexOf("ab-get-shortlink"))){m=m.parentNode}if(m&&m.className&&-1!=m.className.indexOf("ab-get-shortlink")){d=i.getElementsByTagName("link");if(!d.length){d=i.links}l=d.length;if(n.preventDefault){n.preventDefault()}n.returnValue=false;while(l--){if(d[l]&&"shortlink"==d[l].getAttribute("rel")){prompt(adminBarL10n.url,d[l].href);return false}}alert(adminBarL10n.noShortlink);return false}};c(j,"load",function(){var d=i.getElementsByTagName("body")[0],l=i.getElementById("wpadminbar");if(d&&l){d.appendChild(l);c(l,"mouseover",function(m){h(m.target||m.srcElement)});c(l,"mouseout",function(m){k(m.target||m.srcElement)});c(l,"click",b)}if(j.location.hash){j.scrollBy(0,-32)}})})(document,window); \ No newline at end of file