<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16862] trunk/wp-includes: Admin bar script/style improvements.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16862">16862</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-10 18:47:21 +0000 (Fri, 10 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Admin bar script/style improvements. props ocean90, see <a href="http://trac.wordpress.org/ticket/15308">#15308</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunkwpincludescssadminbarcss">trunk/wp-includes/css/admin-bar.css</a></li>
<li><a href="#trunkwpincludescssadminbardevcss">trunk/wp-includes/css/admin-bar.dev.css</a></li>
<li><a href="#trunkwpincludesjsadminbardevjs">trunk/wp-includes/js/admin-bar.dev.js</a></li>
<li><a href="#trunkwpincludesjsadminbarjs">trunk/wp-includes/js/admin-bar.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/admin-bar.php 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -121,16 +121,16 @@
</span><span class="cx"> foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
</span><span class="cx"> // @todo Replace with some favicon lookup.
</span><span class="cx"> //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
</span><del>- $blavatar = '<img src="' . esc_url($default) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" />';
</del><ins>+ $blavatar = '<img src="' . esc_url($default) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
</ins><span class="cx">
</span><span class="cx"> $marker = '';
</span><del>- if ( strlen($blog->blogname) > 15 )
</del><ins>+ if ( strlen($blog->blogname) > 18 )
</ins><span class="cx"> $marker = '...';
</span><span class="cx">
</span><span class="cx"> if ( empty( $blog->blogname ) )
</span><span class="cx"> $blogname = $blog->domain;
</span><span class="cx"> else
</span><del>- $blogname = substr( $blog->blogname, 0, 15 ) . $marker;
</del><ins>+ $blogname = substr( $blog->blogname, 0, 18 ) . $marker;
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $blog->visible ) || $blog->visible === true ) {
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id), ) );
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/class-wp-admin-bar.php 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> function render() {
</span><span class="cx"> ?>
</span><del>- <div id="wpadminbar" class="snap_nopreview no-grav">
</del><ins>+ <div id="wpadminbar">
</ins><span class="cx"> <div class="quicklinks">
</span><span class="cx"> <ul>
</span><span class="cx"> <?php foreach ( (array) $this->menu as $id => $menu_item ) : ?>
</span></span></pre></div>
<a id="trunkwpincludescssadminbarcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/admin-bar.css (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.css 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/css/admin-bar.css 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#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;}
</del><span class="cx">\ No newline at end of file
</span><ins>+#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;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescssadminbardevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/admin-bar.dev.css (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.dev.css 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/css/admin-bar.dev.css 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -13,6 +13,13 @@
</span><span class="cx"> min-width: 960px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#wpadminbar a,
+#wpadminbar a:hover {
+ outline: none;
+ border: none;
+ text-decoration: none;
+}
+
</ins><span class="cx"> #wpadminbar ul,
</span><span class="cx"> #wpadminbar ul li {
</span><span class="cx"> background: none;
</span><span class="lines">@@ -23,13 +30,14 @@
</span><span class="cx"> z-index: 99999;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar ul li img {
- vertical-align: middle !important;
- margin-right: 8px !important;
- border: none !important;
- padding: 0 !important;
</del><ins>+#wpadminbar .quicklinks ul {
+ text-align: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#wpadminbar .quicklinks ul li {
+ float: left;
+}
+
</ins><span class="cx"> #wpadminbar .quicklinks > ul > li > a {
</span><span class="cx"> border-right: 1px solid #686868;
</span><span class="cx"> border-left: 1px solid #808080;
</span><span class="lines">@@ -43,215 +51,150 @@
</span><span class="cx"> border-left-color: #707070;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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 {
</del><ins>+#wpadminbar .quicklinks a {
+ color: #ddd;
+ height: 28px;
+ text-shadow: #555 0px -1px 0px;
</ins><span class="cx"> display: block;
</span><del>-}
-
-
-#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;
</del><ins>+ font: 13px Arial, Helvetica, sans-serif;
</ins><span class="cx"> font-weight: normal;
</span><del>- white-space: nowrap;
-}
-
-#wpadminbar .menupop a > span {
- background: url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;
- padding-right: .8em;
</del><ins>+ letter-spacing: normal;
+ padding: 0 0.85em;
</ins><span class="cx"> line-height: 28px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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 {
</del><ins>+#wpadminbar .quicklinks .menupop ul {
</ins><span class="cx"> -moz-box-shadow: 0 4px 8px rgba(0,0,0,0.1);
</span><span class="cx"> -webkit-box-shadow: 0 4px 8px rgba(0,0,0,0.1);
</span><ins>+ box-shadow: 0 4px 8px rgba(0,0,0,0.1);
</ins><span class="cx"> background: #fff;
</span><ins>+ background: rgba(255,255,255,0.97);
</ins><span class="cx"> display: none;
</span><span class="cx"> position: absolute;
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><del>- border-top: none !important;
</del><ins>+ border-top: none;
</ins><span class="cx"> float: none;
</span><span class="cx"> }
</span><del>-
-html>body #wpadminbar .menupop ul {
- background: rgba(255,255,255,0.97);
- border-color: rgba(0,0,0,0.1);
-}
-
-#wpadminbar .menupop li {
</del><ins>+#wpadminbar .quicklinks .menupop ul li {
</ins><span class="cx"> float: none;
</span><del>- margin: 0;
- padding: 0;
- background-image: none;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar .quicklinks a {
- border: none;
- color: #ddd !important;
- height: 28px;
- text-shadow: #555 0px -1px 0px;
- display: block;
- font: 13px Arial, Helvetica, sans-serif;
</del><ins>+#wpadminbar .quicklinks .menupop ul li a {
+ color: #555;
+ text-shadow: none;
</ins><span class="cx"> font-weight: normal;
</span><del>- letter-spacing: normal;
- padding: 0 0.85em;
- line-height: 28px;
- text-decoration: none !important;
-}
-
-#wpadminbar .quicklinks li ul li a {
</del><ins>+ white-space: nowrap;
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> width: 160px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar .quicklinks a:hover {
- text-shadow: #333 0px -1px 0px;
</del><ins>+#wpadminbar .quicklinks .menupop ul li:hover > a {
+ color: #fff;
+ text-shadow: #666 0px -1px 0px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
-#wpadminbar li:hover {
- background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;
</del><ins>+#wpadminbar .quicklinks li:hover > ul,
+#wpadminbar .quicklinks li.hover > ul {
+ display: block;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#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;
</del><ins>+#wpadminbar .quicklinks .menupop li:hover > ul,
+#wpadminbar .quicklinks .menupop li.hover > ul {
+ margin-left: 100%;
+ margin-top: -28px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar li li:hover > a {
- color: #fff !important;
</del><ins>+#wpadminbar .quicklinks li:hover {
+ background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quicklinks ul {
- list-style: none;
- margin: 0;
- padding: 0;
- text-align: left;
</del><ins>+#wpadminbar .quicklinks .menupop li:hover {
+ background: #888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quicklinks ul li {
- float: left;
- margin: 0;
</del><ins>+#wpadminbar .quicklinks .menupop a > span {
+ background: url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;
+ padding-right: .8em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
-#adminbarsearch {
- float: right;
- height: 18px;
- padding: 3px;
</del><ins>+#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;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#adminbarsearch * {
- color: #555;
- font-size: 12px;
</del><ins>+#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;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar li.ab-me:hover {
- background: none;
</del><ins>+#wpadminbar .quicklinks a:hover span#ab-awaiting-mod,
+#wpadminbar .quicklinks a:hover span#ab-updates {
+ background: #fff;
+ color: #000;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar li.ab-me > a {
- line-height: 18px !important;
- border: none !important;
</del><ins>+#wpadminbar .quicklinks li.ab-me a {
+ border: none;
</ins><span class="cx"> background: url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;
</span><del>- height: 28px;
- padding: 0 1.15em 0 0.7em;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar li.ab-blog > a:hover {
- background-position: 67% 59.8%;
</del><ins>+#wpadminbar .quicklinks li.ab-my-account a {
+ border-left: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar li.ab-me img.avatar {
- margin: 4px 0 0 0 !important;
- vertical-align: middle;
- background: #eee;
- width: 16px !important;
- height: 16px !important;
</del><ins>+#wpadminbar .quicklinks li.ab-me:hover {
+ background: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar li.ab-my-account a {
- border-left: none !important;
- padding-left: 0.7em !important;
- margin-top: 0 !important;
</del><ins>+#wpadminbar .quicklinks li.ab-me a img.avatar {
+ border: 1px solid #999;
+ margin: 5px 2px 0 -4px;
+ background: #eee;
+ width: 16px;
+ height: 16px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar ul li img {
- width: 16px !important;
- height: 16px !important;
</del><ins>+#wpadminbar .quicklinks .menupop li a img.blavatar {
+ vertical-align: middle;
+ margin-right: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar #adminbar-search {
- line-height: normal !important;
- width: 140px !important;
- margin-top: 0px !important;
</del><ins>+#wpadminbar #adminbarsearch {
+ float: right;
+ height: 18px;
+ padding: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.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;
</del><ins>+#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;
</ins><span class="cx"> outline: none;
</span><span class="cx"> text-shadow: 0 1px 0 #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-button.adminbar-button {
</del><ins>+#wpadminbar #adminbarsearch .adminbar-button {
</ins><span class="cx"> position: relative;
</span><span class="cx"> border: 0;
</span><span class="cx"> cursor: pointer;
</span><span class="lines">@@ -261,58 +204,43 @@
</span><span class="cx"> background: url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;
</span><span class="cx"> padding: 0 14px 0 0;
</span><span class="cx"> text-align: center;
</span><ins>+ outline: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-button.adminbar-button span {
</del><ins>+#wpadminbar #adminbarsearch .adminbar-button span {
</ins><span class="cx"> position: relative;
</span><span class="cx"> display: block;
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> height: 19px;
</span><span class="cx"> background: url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;
</span><span class="cx"> padding: 3px 0 0 14px;
</span><del>- font: 12px Arial, Helvetica, sans-serif !important;
- font-weight: bold !important;
- color: #444 !important;
- text-shadow: 0px 1px 0px #eee !important;
</del><ins>+ font: 12px Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ color: #444;
+ text-shadow: 0px 1px 0px #eee;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-button.adminbar-button:active {
- background-position: right -184px !important;
- text-shadow: 0px 1px 0px #eee !important;
</del><ins>+#wpadminbar #adminbarsearch .adminbar-button:active {
+ background-position: right -184px;
+ text-shadow: 0px 1px 0px #eee;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-button.adminbar-button:hover span {
- color: #000 !important;
</del><ins>+#wpadminbar #adminbarsearch .adminbar-button:hover span {
+ color: #000;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-button.adminbar-button:active span {
- background-position: left -146px !important;
</del><ins>+#wpadminbar #adminbarsearch .adminbar-button:active span {
+ background-position: left -146px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-button.adminbar-button::-moz-focus-inner {
</del><ins>+#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner {
</ins><span class="cx"> border: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (-webkit-min-device-pixel-ratio: 0) {
- button.adminbar-button span {
- margin-top: -1px;
- }
</del><span class="cx">
</span><del>-}
-
-
</del><span class="cx"> /**
</span><span class="cx"> * IE 6-targeted rules
</span><span class="cx"> */
</span><del>-
-* 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;
-}
-
</del><span class="cx"> * html #wpadminbar {
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> position: absolute;
</span><span class="lines">@@ -322,16 +250,9 @@
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-* html #adminbarsearch-wrap {
- position: absolute;
- top: 0;
</del><ins>+* html #wpadminbar,
+* html #wpadminbar .menupop a span,
+* html #wpadminbar .quicklinks li,
+* html #wpadminbar .quicklinks li:hover {
+ background-image: none;
</ins><span class="cx"> }
</span><del>-
-* html #wpadminbar ul,
-* html #wpadminbar ul li {
- zoom: 1;
-}
-
-/**
- * End IE 6-targeted rules
- */
</del></span></pre></div>
<a id="trunkwpincludesjsadminbardevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/admin-bar.dev.js (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/admin-bar.dev.js 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/js/admin-bar.dev.js 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -28,14 +28,14 @@
</span><span class="cx"> while ( t && t != aB && t != d ) {
</span><span class="cx"> if( 'LI' == t.nodeName.toUpperCase() ) {
</span><span class="cx"> ancestors[ ancestors.length ] = t;
</span><del>- id = getTOID(t);
</del><ins>+ id = getTOID(t);
</ins><span class="cx"> if ( id )
</span><span class="cx"> clearTimeout( id );
</span><span class="cx"> t.className = t.className ? ( t.className.replace(hc, '') + ' hover' ) : 'hover';
</span><span class="cx"> }
</span><span class="cx"> t = t.parentNode;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /* remove the hover class for any objects not in the immediate element's ancestry */
</span><span class="cx"> while ( i-- ) {
</span><span class="cx"> inA = false;
</span><span class="lines">@@ -44,9 +44,8 @@
</span><span class="cx"> if ( ancestors[ ancestorLength ] == q[i][1] )
</span><span class="cx"> inA = true;
</span><span class="cx"> }
</span><del>-
- /* keep delayed hover on mu (superadmin) menu because it's so easy to mouse away from */
- if ( ! inA && -1 == q[i][1].className.indexOf('ab-superadmin') )
</del><ins>+
+ if ( ! inA )
</ins><span class="cx"> q[i][1].className = q[i][1].className ? q[i][1].className.replace(hc, '') : '';
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="lines">@@ -67,7 +66,6 @@
</span><span class="cx">
</span><span class="cx"> clickShortlink = function(e) {
</span><span class="cx"> var t = e.target || e.srcElement, links, i;
</span><del>-
</del><span class="cx">
</span><span class="cx"> if ( 'undefined' == typeof adminBarL10n )
</span><span class="cx"> return;
</span><span class="lines">@@ -95,7 +93,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> alert( adminBarL10n.noShortlink );
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -104,7 +102,7 @@
</span><span class="cx"> addEvent(w, 'load', function() {
</span><span class="cx"> var b = d.getElementsByTagName('body')[0],
</span><span class="cx"> s = d.getElementById('adminbar-search');
</span><del>-
</del><ins>+
</ins><span class="cx"> aB = d.getElementById('wpadminbar');
</span><span class="cx">
</span><span class="cx"> if ( b && aB ) {
</span><span class="lines">@@ -132,7 +130,7 @@
</span><span class="cx"> this.value = this.getAttribute('title') == this.value ? '' : this.value;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( w.location.hash )
</span><span class="cx"> w.scrollBy(0,-32);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpincludesjsadminbarjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/admin-bar.js (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/admin-bar.js 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/js/admin-bar.js 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(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&&-1==a[d][1].className.indexOf("ab-superadmin")){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);
</del><span class="cx">\ No newline at end of file
</span><ins>+(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);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16861 => 16862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-12-10 18:40:48 UTC (rev 16861)
+++ trunk/wp-includes/script-loader.php 2010-12-10 18:47:21 UTC (rev 16862)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
</span><span class="cx"> $scripts->add_data( 'user-profile', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101126');
</del><ins>+ $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101210');
</ins><span class="cx"> $scripts->add_data( 'admin-bar', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'admin-bar', 'adminBarL10n', array(
</span><span class="cx"> 'url' => __( 'URL:' ),
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
</span><span class="cx"> $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
</span><span class="cx"> $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
</span><del>- $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101209' );
</del><ins>+ $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101210' );
</ins><span class="cx"> $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101119' );
</span><span class="cx"> $styles->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/css/wplink$suffix.css", array(), '20101206' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>