Ticket #45094: 45094.diff

src/wp-admin/css/common.css

@@ -1659 +1659 @@
 }
 
 #screen-meta-links {
+        float: right;
         margin: 0 20px 0 0;
 }
 
@@ -1675 +1676 @@
 
 #screen-options-link-wrap,
 #contextual-help-link-wrap {
-        float: right;
+        float: left;
         height: 28px;
         margin: 0 0 0 6px;
         border: 1px solid #ddd;

src/wp-admin/includes/class-wp-screen.php

@@ -927 +927 @@
                 }
                 ?>
                 <div id="screen-meta-links">
-                <?php if ( $this->get_help_tabs() ) : ?>
-                        <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-                        <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
+                <?php if ( $this->show_screen_options() ) : ?>
+                        <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
+                        <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
                         </div>
                         <?php
                 endif;
-                if ( $this->show_screen_options() ) :
+                if ( $this->get_help_tabs() ) :
                         ?>
-                        <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-                        <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
+                        <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
+                        <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
                         </div>
                 <?php endif; ?>
                 </div>

src/wp-includes/css/buttons.css

@@ -286 +286 @@
         box-shadow: 0 2px 0 #006799;
 }
 
+.wp-core-ui .button.button-primary.button-hero:focus {
+        box-shadow:
+                0 2px 0 #006799,
+                0 1px 0 #0073aa,
+                0 0 2px 1px #33b3db;
+}
+
 .wp-core-ui .button.button-primary.button-hero.active,
 .wp-core-ui .button.button-primary.button-hero.active:hover,
 .wp-core-ui .button.button-primary.button-hero.active:focus,