Ticket #21598: 21598.10.diff

wp-admin/includes/theme-install.php

@@ -81 +81 @@
         <label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
         <?php endif; ?>
         <input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
-        <?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
+        <?php submit_button( __( 'Search' ), 'small', 'search', false ); ?>
 </form>
 <?php
 }

wp-admin/includes/widgets.php

@@ -212 +212 @@
                 </div>
                 <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
                 <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
-                <?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+                <?php submit_button( __( 'Save' ), 'button-small button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
                 </div>
                 <br class="clear" />
         </div>

wp-admin/custom-header.php

@@ -558 +558 @@
                 <input type="file" id="upload" name="import" />
                 <input type="hidden" name="action" value="save" />
                 <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-                <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+                <?php submit_button( __( 'Upload' ), 'button-small', 'submit', false ); ?>
         </p>
         <?php
                 $image_library_url = get_upload_iframe_src( 'image', null, 'library' );

wp-admin/network/upgrade.php

@@ -72 +72 @@
                         do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
                 }
                 echo "</ul>";
-                ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
+                ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button button-small" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
                 <script type='text/javascript'>
                 <!--
                 function nextpage() {

wp-admin/css/colors-fresh.css

@@ -419 +419 @@
         color: #000;
 }
 
+.button.focus,
+.button:focus,
+.button-secondary.focus,
+.button-secondary:focus,
+.submit input.focus,
+.submit input:focus,
+input[type=button].focus,
+input[type=button]:focus,
+input[type=submit]:focus {
+        border-color: #999;
+        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
+        box-shadow: 1px 1px 1px rgba(0,0,0,.2);
+}
+
 .button.active,
 .button:active,
-.small.active,
-.small:active,
 .button-secondary.active,
 .button-secondary:active,
 .submit input:active,
@@ -441 +453 @@
         box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
 }
 
-.button.focus,
-.button:focus,
-.button-secondary.focus,
-.button-secondary:focus,
-.submit input.focus,
-.submit input:focus,
-input[type=button].focus,
-input[type=button]:focus,
-input[type=submit]:focus {
-        border-color: #aaa;
-}
-
 input.button-primary,
 button.button-primary,
 a.button-primary {
@@ -492 +492 @@
         text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
 }
 
+input.button-primary.focus,
+input.button-primary:focus,
+button.button-primary:focus,
+a.button-primary:focus {
+        border-color: #0e3950;
+        -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
+        box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
+}
+
 input.button-primary.active,
 input.button-primary:active,
 button.button-primary:active,
@@ -508 +517 @@
         box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
 }
 
-input.button-primary.focus,
-input.button-primary:focus,
-button.button-primary:focus,
-a.button-primary:focus {
-        border-color: #124560;
-}
-
 .button-disabled,
 .button[disabled],
 .button:disabled,
@@ -536 +538 @@
         box-shadow:         none !important;
 }
 
+.button-primary-disabled:hover,
+.button-primary[disabled]:hover {
+        text-shadow: none;
+}
+
 a:hover,
 a:active {
         color: #d54e21;

wp-admin/css/wp-admin.css

@@ -783 +783 @@
         display: inline-block;
         text-decoration: none;
         font-size: 12px;
-        line-height: 15px;
+        line-height: 17px;
+        height: 15px;
         margin: 0;
-        padding: 0.5em 0.8em 0.4em;
+        padding: 0.4em 0.8em 0.5em;
         cursor: pointer;
         border-width: 1px;
         border-style: solid;
@@ -798 +799 @@
 }
 
 .button.button-small {
-        padding: 3px .8em 2px;
+        padding: 2px .8em 3px;
 }
 
 .button.button-large {
     font-size: 14px;
-    padding: 0.6em 1em 0.5em;
+    padding: 0.5em 1em 0.6em;
 }
 
 .button.button-tiny {
@@ -959 +960 @@
         text-align: right;
         float: right;
         line-height: 23px;
+        margin-right: 4px;
 }
 
 #misc-publishing-actions {
@@ -6106 +6108 @@
 }
 
 #dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-        margin: 0 1em 0 0;
+        margin: 0 0.5em 0 6px;
 }
 
 #dashboard-widgets #dashboard_quick_press form p.submit #publish {

wp-admin/css/colors-classic.css

@@ -542 +542 @@
         box-shadow:         none !important;
 }
 
+.button-primary-disabled:hover,
+.button-primary[disabled]:hover {
+        text-shadow: none;
+}
+
 a:hover,
 a:active {
         color: #d54e21;

wp-admin/css/customize-controls.css

@@ -157 +157 @@
 
 #customize-header-actions .button-primary {
         float: right;
-        margin-top: 11px;
+        margin-top: 8px;
 }
 
 #customize-header-actions img {

wp-admin/widgets.php

@@ -277 +277 @@
         } else {
                 submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
         }
-        submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
+        submit_button( __( 'Save Widget' ), 'button-small button-primary alignright', 'savewidget', false ); ?>
         <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
         <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
         <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />

wp-admin/themes.php

@@ -224 +224 @@
 <p class="search-box">
         <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Installed Themes'); ?>:</label>
         <input type="search" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-        <?php submit_button( __( 'Search Installed Themes' ), 'button', false, false, array( 'id' => 'search-submit' ) ); ?>
+        <?php submit_button( __( 'Search Installed Themes' ), 'small', false, false, array( 'id' => 'search-submit' ) ); ?>
         <a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
 </p>
 

wp-admin/custom-background.php

@@ -260 +260 @@
                 <input type="file" id="upload" name="import" />
                 <input type="hidden" name="action" value="save" />
                 <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-                <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+                <?php submit_button( __( 'Upload' ), 'button-small', 'submit', false ); ?>
         </p>
         <?php
                 $image_library_url = get_upload_iframe_src( 'image', null, 'library' );