Ticket #18197: 18197.move-items.diff

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

@@ -65 +65 @@
 #wpadminbar .quicklinks ul li {
         float: left;
 }
+#wpadminbar ul li.wp-admin-bar-logo,
+#wpadminbar #wp-admin-bar-screen-options,
+#wpadminbar #wp-admin-bar-help {
+        float: right;
+}
 
 #wpadminbar .quicklinks > ul > li > a {
         border-right: 1px solid #555;
@@ -72 +77 @@
 }
 
 #wpadminbar .quicklinks > ul > li:last-child > a {
-        border-right: none;
+        /*border-right: none;*/
 }
 
 #wpadminbar .quicklinks a,
@@ -140 +145 @@
         margin-top: -28px;
 }
 
-#wpadminbar .quicklinks li:hover,
-#wpadminbar .quicklinks .selected {
+#wpadminbar .quicklinks li:hover {
         background-color: #fff;
 }
+#wpadminbar .quicklinks .selected, #wpadminbar .quicklinks .selected:hover {
+        background-color: #f1f1f1;
+}
 
 #wpadminbar .quicklinks li:hover a,
 #wpadminbar .quicklinks .selected a,
@@ -158 +165 @@
 /*      background: #888;
         background: -moz-linear-gradient(bottom,  #888,  #9d9d9d);
         background: -webkit-gradient(linear, left bottom, left top, from(#888), to(#9d9d9d));*/
-        background: #f8fbfe;
+        background: #f2f9ff;
 }
 
 #wpadminbar .quicklinks .menupop a > span {
@@ -192 +199 @@
         color: #000;
 }
 
-#wpadminbar #wp-admin-bar-my-account,
-#wpadminbar #wp-admin-bar-my-account-with-avatar {
-        float: right;
+#wpadminbar #wp-admin-bar-my-account ul,
+#wpadminbar #wp-admin-bar-my-account-with-avatar ul {
+        margin: 0;
 }
 
 #wpadminbar .quicklinks li#wp-admin-bar-my-account > a {
-        border: none;
+        border-left: none;
 }
 
 #wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar > a {
-        border: none;
+        border-left: none;
 }
 
 #wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar > a img {
@@ -336 +343 @@
 #wpadminbar .wp-admin-bar-logo {
         background: url(../images/wp-logo-white.png) no-repeat 8px 6px;
 }
-#wpadminbar .wp-admin-bar-logo > a {
+#wpadminbar ul li.wp-admin-bar-logo > a {
+        border-right: none;
         padding-left: 22px;
+        padding-right: .5em;
 }
 
 #wpadminbar .wp-admin-bar-logo:hover {
         background: url(../images/wp-logo-dark.png) no-repeat 8px 6px;
 }
 
+#wpadminbar .wp-admin-bar-logo > ul {
+        right: 0;
+}
+
 /**
  * Comments icon
  */

wp-includes/class-wp-admin-bar.php

@@ -186 +186 @@
                         add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 );
                 } else {
                         add_action( 'admin_bar_menu', 'wp_admin_bar_blog_admin_menu', 25 );
-                        add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 90 );
+                        add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 80 );
                 }
 
                 do_action( 'add_admin_bar_menus' );

wp-admin/includes/template.php

@@ -1750 +1750 @@
 
         // If we have screen options, add the menu to the admin bar.
         if ( $show_screen )
-                add_action( 'admin_bar_menu', 'wp_admin_bar_screen_options_menu', 80 );
+                add_action( 'admin_bar_menu', 'wp_admin_bar_screen_options_menu', 90 );
 
 
 ?>