Ticket #15851: 15851.reset3.patch

wp-includes/admin-bar.php

@@ -204 +204 @@
         $awaiting_mod = wp_count_comments();
         $awaiting_mod = $awaiting_mod->moderated;
 
-        $awaiting_mod = $awaiting_mod ? "<span id='ab-awaiting-mod'><span class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span></span>" : '';
+        $awaiting_mod = $awaiting_mod ? "<span id='ab-awaiting-mod' class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span>" : '';
         $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), $awaiting_mod ), 'href' => admin_url('edit-comments.php') ) );
 }
 

wp-includes/css/admin-bar-rtl.dev.css

@@ -65 +65 @@
         margin-left: 8px;
 }
 
-#wpadminbar .quicklinks li.ab-my-account > a {
+#wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
         background: url(../images/admin-bar-sprite-rtl.png?d=11122010) top right no-repeat;
 }
 
-#wpadminbar .quicklinks li.ab-my-account > a {
+#wpadminbar .quicklinks li.ab-my-account > a,
+#wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
         border-right: none;
         border-left: 1px solid #686868;
 }

wp-includes/css/admin-bar.dev.css

@@ +1 @@
+#wpadminbar * {
+        height: auto;
+        width: auto;
+        margin: 0;
+        padding: 0;
+        position: static;
+        text-transform: none;
+        letter-spacing: normal;
+        line-height: 1;
+}
+
+#wpadminbar :before,
+#wpadminbar :after {
+        content: normal;
+}
+
+#wpadminbar a,
+#wpadminbar a:hover,
+#wpadminbar a img, 
+#wpadminbar a img:hover {
+        outline: none;
+        border: none;
+        text-decoration: none;
+        background: none;
+}
+
 #wpadminbar {
         direction: ltr;
         background: #666;
@@ -4 +30 @@
         background: -moz-linear-gradient(bottom,  #666,  #7f7f7f);
         background: -webkit-gradient(linear, left bottom, left top, from(#666), to(#7f7f7f));
         color: #ddd;
-        font: 12px Arial, Helvetica, sans-serif;
+        font: normal 12px/28px Arial, Helvetica, sans-serif;
         height: 28px;
-        margin: 0;
-        padding: 0;
         position: fixed;
         top: 0;
         left: 0;
@@ -16 +40 @@
         min-width: 960px;
 }
 
-#wpadminbar a,
-#wpadminbar a:hover {
-        outline: none;
-        border: none;
-        text-decoration: none;
-}
-
 #wpadminbar ul,
 #wpadminbar ul li {
         background: none;
@@ -59 +76 @@
         height: 28px;
         text-shadow: #555 0px -1px 0px;
         display: block;
-        font: 13px Arial, Helvetica, sans-serif;
-        font-weight: normal;
-        letter-spacing: normal;
+        font: normal 13px/28px Arial, Helvetica, sans-serif;
         padding: 0 0.85em;
+        margin: 0;
+}
+
+#wpadminbar .quicklinks a > span {
         line-height: 28px;
 }
 
@@ -86 +105 @@
 #wpadminbar .quicklinks .menupop ul li a {
         color: #555;
         text-shadow: none;
-        font-weight: normal;
         white-space: nowrap;
         overflow: hidden;
         width: 160px;
@@ -121 +139 @@
 }
 
 #wpadminbar .quicklinks .menupop a > span {
+        display: inline;
         background: url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat;
         padding-right: .8em;
 }
@@ -151 +170 @@
         background: #fff;
         color: #000;
 }
+#wpadminbar .quicklinks li.ab-my-account > a {
+        border-left: none;
+}
 
 #wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
         border-left: none;
@@ -164 +186 @@
         margin: -2px 23px 0 -5px;
         padding: 0;
         background: #eee;
+        float: none;
 }
 
 #wpadminbar .quicklinks li.ab-my-account-with-avatar ul {
@@ -172 +195 @@
 
 #wpadminbar .quicklinks .menupop li a img.blavatar {
         vertical-align: middle;
-        margin-right: 8px;
+        margin: 0 8px 0 0;
+        padding: 0;
 }
 
 #wpadminbar #adminbarsearch {
@@ -184 +208 @@
 
 #wpadminbar #adminbarsearch .adminbar-input {
         width: 140px;
+        height: auto;
         float: left;
         font: 12px Arial, Helvetica, sans-serif;
         color: #555;
@@ -191 +216 @@
         border: 1px solid #626262;
         padding: 2px 3px;
         margin: 0 3px 0 0;
-        background-color: #ddd;
+        background: #ddd;
         -moz-box-shadow: inset 2px 2px 1px #cdcdcd;
         -webkit-box-shadow: inset 2px 2px 1px #cdcdcd;
         box-shadow: inset 2px 2px 1px #cdcdcd;
@@ -222 +247 @@
         border: 1px solid #626262;
         padding: 2px 13px;
         margin: 0;
+        width: auto;
+        height: auto;
 }
 
 #wpadminbar #adminbarsearch .adminbar-button:active {
@@ -254 +281 @@
         float: left;
 }
 
-* html #wpadminbar,
-* html #wpadminbar .menupop a span,
-* html #wpadminbar .quicklinks li,
-* html #wpadminbar .quicklinks li:hover {
+* html #wpadminbar .menupop a span {
         background-image: none;
 }