WordPress.org
Get WordPress

Make WordPress Core

Changeset 38672


Ignore:
Timestamp:
09/28/2016 07:53:07 PM (8 years ago)
Author:
afercia
Message:

Administration: Improve the usage of the button CSS classes.

Introduces some consistency in the usage of the button CSS classes, fixes the
focus style for accessibility and responsiveness of the buttons.

  • Adds the button class to all primary buttons make them responsive
  • Removes all secondary-button classes and replaces it with button when needed. button-secondary shouldn't be used and exists just for backward compatibility reasons
  • Replaces classes inside submit_button() with a shorthand for some buttons, and use an empty string for the default button class. Passing button is unnecessary
  • Adjusts get_submit_button() to remove empty items

Props iseulde, dimchik, chris_d2d, mhowell, afercia.
Fixes #27314, #37138, #37448.

Location:
trunk
Files:
52 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/css/customize-controls.css

    r38648 r38672  
    12051205 */
    12061206
    1207 /* higher specificity than .wp-core-ui .button-secondary */
     1207/* higher specificity than .wp-core-ui .button */
    12081208#customize-theme-controls .add-new-widget,
    12091209#customize-theme-controls .add-new-menu-item {

  • trunk/src/wp-admin/css/ie.css

    r37740 r38672  
    222222
    223223#wpbody-content input.button,
    224 #wpbody-content input.button-primary,
    225 #wpbody-content input.button-secondary {
     224#wpbody-content input.button-primary {
    226225    overflow: visible;
    227226}
    … …  
    448447}
    449448
    450 .tablenav .button-secondary,
    451 .nav .button-secondary {
     449.tablenav .button,
     450.nav .button {
    452451    padding-top: 2px;
    453452    padding-bottom: 2px;
    … …  
    508507}
    509508
    510 .tablenav a.button-secondary {
     509.tablenav a.button {
    511510    display: inline-block;
    512511    padding: 2px 5px;

  • trunk/src/wp-admin/css/install.css

    r38152 r38672  
    444444}
    445445
    446 .button-secondary.hide-if-no-js,
     446.button.hide-if-no-js,
    447447.hide-if-no-js {
    448448    display: none;

  • trunk/src/wp-admin/css/list-tables.css

    r38237 r38672  
    657657}
    658658
     659.tablenav a.button,
    659660.tablenav a.button-secondary {
    660661    display: block;

  • trunk/src/wp-admin/css/themes.css

    r38602 r38672  
    115115}
    116116
    117 .theme-browser .theme .theme-actions .button-secondary {
     117.theme-browser .theme .theme-actions .button {
    118118    float: none;
    119119    margin-left: 3px;

  • trunk/src/wp-admin/custom-background.php

    r38028 r38672  
    243243<form method="post">
    244244<?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
    245 <?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/>
     245<?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
    246246<?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>
    247247</form>
    … …  
    257257<form method="post">
    258258<?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
    259 <?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/>
     259<?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
    260260<?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>
    261261</form>
    … …  
    273273        <input type="hidden" name="action" value="save" />
    274274        <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
    275         <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
     275        <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
    276276    </p>
    277277    <p>

  • trunk/src/wp-admin/custom-header.php

    r37914 r38672  
    577577        <input type="hidden" name="action" value="save" />
    578578        <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
    579         <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
     579        <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
    580580    </p>
    581581    <?php
    … …  
    635635<td>
    636636    <p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
    637     <?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
     637    <?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
    638638</td>
    639639</tr>
    … …  
    646646<td>
    647647    <p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
    648     <?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
     648    <?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
    649649</td>
    650650</tr>
    … …  
    824824    <?php
    825825    if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
    826         submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
     826        submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
    827827    ?>
    828828    </p>

  • trunk/src/wp-admin/customize.php

    r38648 r38672  
    169169            </div>
    170170            <?php endif; ?>
    171             <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
     171            <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
    172172                <span class="collapse-sidebar-arrow"></span>
    173173                <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>

  • trunk/src/wp-admin/includes/class-wp-comments-list-table.php

    r38334 r38672  
    352352             */
    353353            do_action( 'restrict_manage_comments' );
    354             submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
     354            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
    355355        }
    356356

  • trunk/src/wp-admin/includes/class-wp-links-list-table.php

    r36808 r38672  
    113113            echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
    114114            wp_dropdown_categories( $dropdown_options );
    115             submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
     115            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
    116116?>
    117117        </div>

  • trunk/src/wp-admin/includes/class-wp-list-table.php

    r38647 r38672  
    362362    <label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
    363363    <input type="search" id="<?php echo esc_attr( $input_id ); ?>" name="s" value="<?php _admin_search_query(); ?>" />
    364     <?php submit_button( $text, 'button', '', false, array( 'id' => 'search-submit' ) ); ?>
     364    <?php submit_button( $text, '', '', false, array( 'id' => 'search-submit' ) ); ?>
    365365</p>
    366366<?php

  • trunk/src/wp-admin/includes/class-wp-media-list-table.php

    r38031 r38672  
    175175            do_action( 'restrict_manage_posts', $this->screen->post_type );
    176176
    177             submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
     177            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
    178178        }
    179179

  • trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

    r38459 r38672  
    489489
    490490                            $action_links[] = sprintf(
    491                                 '<a href="%1$s" class="button activate-now button-secondary" aria-label="%2$s">%3$s</a>',
     491                                '<a href="%1$s" class="button activate-now" aria-label="%2$s">%3$s</a>',
    492492                                esc_url( $activate_url ),
    493493                                esc_attr( sprintf( $button_label, $plugin['name'] ) ),

  • trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

    r38307 r38672  
    368368            <label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
    369369            <input type="search" id="<?php echo esc_attr( $input_id ); ?>" class="wp-filter-search" name="s" value="<?php _admin_search_query(); ?>" placeholder="<?php esc_attr_e( 'Search installed plugins...' ); ?>"/>
    370             <?php submit_button( $text, 'button hide-if-js', '', false, array( 'id' => 'search-submit' ) ); ?>
     370            <?php submit_button( $text, 'hide-if-js', '', false, array( 'id' => 'search-submit' ) ); ?>
    371371        </p>
    372372        <?php
    … …  
    497497
    498498        if ( 'recently_activated' == $status ) {
    499             submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
     499            submit_button( __( 'Clear List' ), '', 'clear-recent-list', false );
    500500        } elseif ( 'top' === $which && 'mustuse' === $status ) {
    501501            /* translators: %s: mu-plugins directory name */

  • trunk/src/wp-admin/includes/class-wp-posts-list-table.php

    r38024 r38672  
    480480            do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
    481481
    482             submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
     482            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
    483483        }
    484484
    … …  
    17141714    ?>
    17151715        <p class="submit inline-edit-save">
    1716             <button type="button" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></button>
     1716            <button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
    17171717            <?php if ( ! $bulk ) {
    17181718                wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
    17191719                ?>
    1720                 <button type="button" class="button-primary save alignright"><?php _e( 'Update' ); ?></button>
     1720                <button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
    17211721                <span class="spinner"></span>
    17221722            <?php } else {
    1723                 submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false );
     1723                submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );
    17241724            } ?>
    17251725            <input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />

  • trunk/src/wp-admin/includes/class-wp-terms-list-table.php

    r38489 r38672  
    620620
    621621        <p class="inline-edit-save submit">
    622             <button type="button" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></button>
    623             <button type="button" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
     622            <button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>
     623            <button type="button" class="save button button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
    624624            <span class="spinner"></span>
    625625            <span class="error" style="display:none;"></span>

  • trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

    r38307 r38672  
    330330            <div class="wp-full-overlay-sidebar">
    331331                <div class="wp-full-overlay-header">
    332                     <a href="#" class="close-full-overlay button-secondary"><?php _e( 'Close' ); ?></a>
     332                    <a href="#" class="close-full-overlay button"><?php _e( 'Close' ); ?></a>
    333333                    <span class="theme-install"></span>
    334334                </div>
    … …  
    337337                </div>
    338338                <div class="wp-full-overlay-footer">
    339                     <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
     339                    <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
    340340                        <span class="collapse-sidebar-arrow"></span>
    341341                        <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
    … …  
    399399            switch ( $status ) {
    400400                case 'update_available':
    401                     echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
     401                    echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
    402402                    break;
    403403                case 'newer_installed':
    … …  
    407407                case 'install':
    408408                default:
    409                     echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
     409                    echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
    410410                    break;
    411411            } ?>

  • trunk/src/wp-admin/includes/class-wp-users-list-table.php

    r37488 r38672  
    268268        </select>
    269269    <?php
    270             submit_button( __( 'Change' ), 'button', 'changeit', false );
     270            submit_button( __( 'Change' ), '', 'changeit', false );
    271271        endif;
    272272

  • trunk/src/wp-admin/includes/dashboard.php

    r38459 r38672  
    428428            <label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
    429429            <input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
    430             <?php submit_button( __( 'Search Users' ), 'button', false, false, array( 'id' => 'submit_users' ) ); ?>
     430            <?php submit_button( __( 'Search Users' ), '', false, false, array( 'id' => 'submit_users' ) ); ?>
    431431        </p>
    432432    </form>
    … …  
    436436            <label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
    437437            <input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
    438             <?php submit_button( __( 'Search Sites' ), 'button', false, false, array( 'id' => 'submit_sites' ) ); ?>
     438            <?php submit_button( __( 'Search Sites' ), '', false, false, array( 'id' => 'submit_sites' ) ); ?>
    439439        </p>
    440440    </form>

  • trunk/src/wp-admin/includes/file.php

    r38470 r38672  
    12621262    <p class="request-filesystem-credentials-action-buttons">
    12631263        <button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
    1264         <?php submit_button( __( 'Proceed' ), 'button', 'upgrade', false ); ?>
     1264        <?php submit_button( __( 'Proceed' ), '', 'upgrade', false ); ?>
    12651265    </p>
    12661266</div>

  • trunk/src/wp-admin/includes/media.php

    r38614 r38672  
    14811481
    14821482    if ( $r['send'] ) {
    1483         $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
     1483        $r['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false );
    14841484    }
    14851485
    … …  
    20322032
    20332033<p class="savebutton ml-submit">
    2034 <?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
     2034<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
    20352035</p>
    20362036</form>
    … …  
    22432243
    22442244<p class="ml-submit">
    2245 <?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
     2245<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
    22462246<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
    22472247<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
    … …  
    23832383    <label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
    23842384    <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
    2385     <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
     2385    <?php submit_button( __( 'Search Media' ), '', '', false ); ?>
    23862386</p>
    23872387
    … …  
    24802480<?php } ?>
    24812481
    2482 <?php submit_button( __( 'Filter &#187;' ), 'button', 'post-query-submit', false ); ?>
     2482<?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
    24832483
    24842484</div>
    … …  
    25102510</div>
    25112511<p class="ml-submit">
    2512 <?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false ); ?>
     2512<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
    25132513<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
    25142514</p>
    … …  
    26132613            <td></td>
    26142614            <td>
    2615                 ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
     2615                ' . get_submit_button( __( 'Insert into Post' ), '', 'insertonlybutton', false ) . '
    26162616            </td>
    26172617        </tr>

  • trunk/src/wp-admin/includes/meta-boxes.php

    r38616 r38672  
    3333<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
    3434<div style="display:none;">
    35 <?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
     35<?php submit_button( __( 'Save' ), '', 'save' ); ?>
    3636</div>
    3737
    … …  
    291291<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
    292292<div style="display:none;">
    293 <?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
     293<?php submit_button( __( 'Save' ), '', 'save' ); ?>
    294294</div>
    295295
    … …  
    876876<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
    877877<div style="display:none;">
    878 <?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
     878<?php submit_button( __( 'Save' ), '', 'save', false ); ?>
    879879</div>
    880880

  • trunk/src/wp-admin/includes/nav-menu.php

    r38584 r38672  
    285285        <p class="button-controls wp-clearfix">
    286286            <span class="add-to-menu">
    287                 <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
     287                <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
    288288                <span class="spinner"></span>
    289289            </span>
    … …  
    451451                <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
    452452                <span class="spinner"></span>
    453                 <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
     453                <?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
    454454            </p>
    455455
    … …  
    573573
    574574            <span class="add-to-menu">
    575                 <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
     575                <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
    576576                <span class="spinner"></span>
    577577            </span>
    … …  
    740740                <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
    741741                <span class="spinner"></span>
    742                 <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
     742                <?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
    743743            </p>
    744744
    … …  
    771771
    772772            <span class="add-to-menu">
    773                 <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
     773                <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
    774774                <span class="spinner"></span>
    775775            </span>

  • trunk/src/wp-admin/includes/plugin-install.php

    r38459 r38672  
    266266            <input type="search" name="s" value="<?php echo esc_attr( $term ) ?>" class="wp-filter-search" placeholder="<?php esc_attr_e( 'Search Plugins' ); ?>" />
    267267        </label>
    268         <?php submit_button( __( 'Search Plugins' ), 'button hide-if-js', false, false, array( 'id' => 'search-submit' ) ); ?>
     268        <?php submit_button( __( 'Search Plugins' ), 'hide-if-js', false, false, array( 'id' => 'search-submit' ) ); ?>
    269269    </form><?php
    270270}
    … …  
    282282        <label class="screen-reader-text" for="pluginzip"><?php _e( 'Plugin zip file' ); ?></label>
    283283        <input type="file" id="pluginzip" name="pluginzip" />
    284         <?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
     284        <?php submit_button( __( 'Install Now' ), '', 'install-plugin-submit', false ); ?>
    285285    </form>
    286286</div>

  • trunk/src/wp-admin/includes/template.php

    r38470 r38672  
    424424
    425425    <p id="replysubmit" class="submit">
    426     <a href="#comments-form" class="save button-primary alignright">
     426    <a href="#comments-form" class="save button button-primary alignright">
    427427    <span id="addbtn" style="display:none;"><?php _e('Add Comment'); ?></span>
    428428    <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
    429429    <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
    430     <a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
     430    <a href="#comments-form" class="cancel button alignleft"><?php _e('Cancel'); ?></a>
    431431    <span class="waiting spinner"></span>
    432432    <span class="error" style="display:none;"></span>
    … …  
    658658<tr><td colspan="2">
    659659<div class="submit">
    660 <?php submit_button( __( 'Add Custom Field' ), 'secondary', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
     660<?php submit_button( __( 'Add Custom Field' ), '', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
    661661</div>
    662662<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
    … …  
    15141514        </div>
    15151515        <div class="find-box-buttons">
    1516             <?php submit_button( __( 'Select' ), 'button-primary alignright', 'find-posts-submit', false ); ?>
     1516            <?php submit_button( __( 'Select' ), 'primary alignright', 'find-posts-submit', false ); ?>
    15171517            <div class="clear"></div>
    15181518        </div>
    … …  
    19151915        $classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
    19161916    }
    1917     $class = implode( ' ', array_unique( $classes ) );
     1917    // Remove empty items, remove duplicate items, and finally build a string.
     1918    $class = implode( ' ', array_unique( array_filter( $classes ) ) );
    19181919
    19191920    if ( 'delete' === $type )
    1920         $class = 'button-secondary delete';
     1921        $class = 'button delete';
    19211922
    19221923    $text = $text ? $text : __( 'Save Changes' );

  • trunk/src/wp-admin/includes/theme-install.php

    r37985 r38672  
    8686    <?php endif; ?>
    8787    <input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
    88     <?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
     88    <?php submit_button( __( 'Search' ), '', 'search', false ); ?>
    8989</form>
    9090<?php
    … …  
    131131</div>
    132132<br class="clear" />
    133 <?php submit_button( __( 'Find Themes' ), 'button', 'search' ); ?>
     133<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
    134134</form>
    135135<?php
    … …  
    146146    <label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
    147147    <input type="file" id="themezip" name="themezip" />
    148     <?php submit_button( __( 'Install Now' ), 'button', 'install-theme-submit', false ); ?>
     148    <?php submit_button( __( 'Install Now' ), '', 'install-theme-submit', false ); ?>
    149149</form>
    150150    <?php

  • trunk/src/wp-admin/includes/widgets.php

    r35015 r38672  
    255255        </div>
    256256        <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
    257             <?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
     257            <?php submit_button( __( 'Save' ), 'primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
    258258            <span class="spinner"></span>
    259259        </div>

  • trunk/src/wp-admin/install.php

    r38619 r38672  
    142142                    <?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
    143143                    <input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
    144                     <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
     144                    <button type="button" class="button wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
    145145                        <span class="dashicons dashicons-hidden"></span>
    146146                        <span class="text"><?php _e( 'Hide' ); ?></span>

  • trunk/src/wp-admin/js/customize-widgets.js

    r38668 r38672  
    836836            $saveBtn.val( l10n.saveBtnLabel );
    837837            $saveBtn.attr( 'title', l10n.saveBtnTooltip );
    838             $saveBtn.removeClass( 'button-primary' ).addClass( 'button-secondary' );
     838            $saveBtn.removeClass( 'button-primary' );
    839839            $saveBtn.on( 'click', function( e ) {
    840840                e.preventDefault();

  • trunk/src/wp-admin/js/updates.js

    r38240 r38672  
    11061106                    return $( '<a>' )
    11071107                        .attr( 'href', response.customizeUrl )
    1108                         .addClass( 'button button-secondary load-customize' )
     1108                        .addClass( 'button load-customize' )
    11091109                        .text( wp.updates.l10n.livePreview );
    11101110                } );

  • trunk/src/wp-admin/js/widgets.js

    r35317 r38672  
    355355                self.addWidget( chooser );
    356356                self.closeChooser();
    357             } else if ( $target.hasClass('button-secondary') ) {
     357            } else if ( $target.hasClass( 'widgets-chooser-cancel' ) ) {
    358358                self.closeChooser();
    359359            }
    360360        }).on( 'keyup.widgets-chooser', function( event ) {
    361361            if ( event.which === $.ui.keyCode.ENTER ) {
    362                 if ( $( event.target ).hasClass('button-secondary') ) {
     362                if ( $( event.target ).hasClass( 'widgets-chooser-cancel' ) ) {
    363363                    // Close instead of adding when pressing Enter on the Cancel button
    364364                    self.closeChooser();

  • trunk/src/wp-admin/nav-menus.php

    r38616 r38672  
    714714                <?php endforeach; ?>
    715715            </select>
    716             <span class="submit-btn"><input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Select' ); ?>"></span>
     716            <span class="submit-btn"><input type="submit" class="button" value="<?php esc_attr_e( 'Select' ); ?>"></span>
    717717            <span class="add-new-menu-action">
    718718                <?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>

  • trunk/src/wp-admin/network/themes.php

    r38657 r38672  
    159159
    160160                        if ( 1 == $themes_to_delete ) {
    161                             submit_button( __( 'Yes, delete this theme' ), 'button', 'submit', false );
     161                            submit_button( __( 'Yes, delete this theme' ), '', 'submit', false );
    162162                        } else {
    163                             submit_button( __( 'Yes, delete these themes' ), 'button', 'submit', false );
     163                            submit_button( __( 'Yes, delete these themes' ), '', 'submit', false );
    164164                        }
    165165                    ?>
    … …  
    169169                ?>
    170170                <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
    171                     <?php submit_button( __( 'No, return me to the theme list' ), 'button', 'submit', false ); ?>
     171                    <?php submit_button( __( 'No, return me to the theme list' ), '', 'submit', false ); ?>
    172172                </form>
    173173            </div>

  • trunk/src/wp-admin/plugin-editor.php

    r38459 r38672  
    225225?>
    226226        </select>
    227         <?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
     227        <?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
    228228    </form>
    229229</div>

  • trunk/src/wp-admin/plugins.php

    r38647 r38672  
    328328                    ?>
    329329                    <?php wp_nonce_field('bulk-plugins') ?>
    330                     <?php submit_button( $data_to_delete ? __( 'Yes, delete these files and data' ) : __( 'Yes, delete these files' ), 'button', 'submit', false ); ?>
     330                    <?php submit_button( $data_to_delete ? __( 'Yes, delete these files and data' ) : __( 'Yes, delete these files' ), '', 'submit', false ); ?>
    331331                </form>
    332332                <?php
    … …  
    334334                ?>
    335335                <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
    336                     <?php submit_button( __( 'No, return me to the plugin list' ), 'button', 'submit', false ); ?>
     336                    <?php submit_button( __( 'No, return me to the plugin list' ), '', 'submit', false ); ?>
    337337                </form>
    338338            </div>

  • trunk/src/wp-admin/theme-editor.php

    r38459 r38672  
    183183?>
    184184        </select>
    185         <?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
     185        <?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
    186186    </form>
    187187</div>

  • trunk/src/wp-admin/theme-install.php

    r38640 r38672  
    175175                <input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
    176176                <input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
    177                 <input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
     177                <input type="button" class="button favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
    178178            </p>
    179179        </div>
    … …  
    263263            <# } #>
    264264            <# if ( data.customize_url ) { #>
    265                 <a class="button button-secondary load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
     265                <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
    266266            <# } else { #>
    267                 <button class="button-secondary preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
     267                <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
    268268            <# } #>
    269269        <# } else { #>
    … …  
    273273            ?>
    274274            <a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
    275             <button class="button-secondary preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
     275            <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
    276276        <# } #>
    277277    </div>
    … …  
    326326            </div>
    327327            <div class="wp-full-overlay-footer">
    328                 <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
     328                <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
    329329                    <span class="collapse-sidebar-arrow"></span>
    330330                    <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>

  • trunk/src/wp-admin/themes.php

    r38325 r38672  
    201201                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
    202202                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
    203                     $current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
     203                    $current_theme_actions[] = "<a class='button$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
    204204                else
    205                     $current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
     205                    $current_theme_actions[] = "<a class='button$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
    206206            } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
    207207                $menu_file = $item[2];
    … …  
    209209                if ( current_user_can( 'customize' ) ) {
    210210                    if ( 'custom-header' === $menu_file ) {
    211                         $current_theme_actions[] = "<a class='button button-secondary hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
     211                        $current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
    212212                    } elseif ( 'custom-background' === $menu_file ) {
    213                         $current_theme_actions[] = "<a class='button button-secondary hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
     213                        $current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
    214214                    }
    215215                }
    … …  
    220220
    221221                if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
    222                     $current_theme_actions[] = "<a class='button button-secondary$class' href='{$item[2]}'>{$item[0]}</a>";
     222                    $current_theme_actions[] = "<a class='button$class' href='{$item[2]}'>{$item[0]}</a>";
    223223                } else {
    224                     $current_theme_actions[] = "<a class='button button-secondary$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
     224                    $current_theme_actions[] = "<a class='button$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
    225225                }
    226226            }
    … …  
    282282        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
    283283        ?>
    284         <a class="button button-secondary activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
     284        <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
    285285        <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
    286286            <a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
    … …  
    334334                $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
    335335                ?>
    336                 <td><a href="<?php echo esc_url( $delete_url ); ?>" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a></td>
     336                <td><a href="<?php echo esc_url( $delete_url ); ?>" class="button delete-theme"><?php _e( 'Delete' ); ?></a></td>
    337337                <?php
    338338            }
    … …  
    349349                    $install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
    350350                    ?>
    351                     <td><a href="<?php echo esc_url( $install_url ); ?>" class="button button-secondary install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
     351                    <td><a href="<?php echo esc_url( $install_url ); ?>" class="button install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
    352352                    <?php
    353353                }
    … …  
    411411            $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
    412412            ?>
    413             <a class="button button-secondary activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
     413            <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
    414414            <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
    415415        <# } #>
    … …  
    470470                ?>
    471471                <# if ( data.actions.activate ) { #>
    472                     <a href="{{{ data.actions.activate }}}" class="button button-secondary activate" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
     472                    <a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
    473473                <# } #>
    474474                <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
    … …  
    476476
    477477            <# if ( ! data.active && data.actions['delete'] ) { #>
    478                 <a href="{{{ data.actions['delete'] }}}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
     478                <a href="{{{ data.actions['delete'] }}}" class="button delete-theme"><?php _e( 'Delete' ); ?></a>
    479479            <# } #>
    480480        </div>

  • trunk/src/wp-admin/tools.php

    r33819 r38672  
    5050        <p class="pressthis-bookmarklet-wrapper">
    5151            <a class="pressthis-bookmarklet" onclick="return false;" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e( 'Press This' ); ?></span></a>
    52             <button type="button" class="button button-secondary pressthis-js-toggle js-show-pressthis-code-wrap" aria-expanded="false" aria-controls="pressthis-code-wrap">
     52            <button type="button" class="button pressthis-js-toggle js-show-pressthis-code-wrap" aria-expanded="false" aria-controls="pressthis-code-wrap">
    5353                <span class="dashicons dashicons-clipboard"></span>
    5454                <span class="screen-reader-text"><?php _e( 'Copy &#8220;Press This&#8221; bookmarklet code' ) ?></span>
    … …  
    6969
    7070        <p>
    71             <a class="button button-secondary" href="<?php echo htmlspecialchars( admin_url( 'press-this.php' ) ); ?>"><?php _e( 'Open Press This' ) ?></a>
     71            <a class="button" href="<?php echo htmlspecialchars( admin_url( 'press-this.php' ) ); ?>"><?php _e( 'Open Press This' ) ?></a>
    7272        </p>
    7373        <script>

  • trunk/src/wp-admin/update-core.php

    r38470 r38672  
    9393    if ( $show_buttons ) {
    9494        if ( $first_pass ) {
    95             submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false );
     95            submit_button( $submit, $current ? '' : 'primary regular', 'upgrade', false );
    9696            $first_pass = false;
    9797        } else {
    98             submit_button( $submit, 'button', 'upgrade', false );
     98            submit_button( $submit, '', 'upgrade', false );
    9999        }
    100100        echo '&nbsp;<a href="' . esc_url( $update->download ) . '" class="button">' . $download . '</a>&nbsp;';
    … …  
    102102    if ( 'en_US' != $update->locale )
    103103        if ( !isset( $update->dismissed ) || !$update->dismissed )
    104             submit_button( __('Hide this update'), 'button', 'dismiss', false );
     104            submit_button( __( 'Hide this update' ), '', 'dismiss', false );
    105105        else
    106             submit_button( __('Bring back this update'), 'button', 'undismiss', false );
     106            submit_button( __( 'Bring back this update' ), '', 'undismiss', false );
    107107    echo '</p>';
    108108    if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) )

  • trunk/src/wp-admin/user-edit.php

    r38481 r38672  
    506506    <td>
    507507        <input class="hidden" value=" " /><!-- #24364 workaround -->
    508         <button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
     508        <button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
    509509        <div class="wp-pwd hide-if-js">
    510510            <span class="password-input-wrapper">
    511511                <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
    512512            </span>
    513             <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
     513            <button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
    514514                <span class="dashicons dashicons-hidden"></span>
    515515                <span class="text"><?php _e( 'Hide' ); ?></span>
    516516            </button>
    517             <button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
     517            <button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
    518518                <span class="text"><?php _e( 'Cancel' ); ?></span>
    519519            </button>
    … …  
    545545        <th><?php _e( 'Sessions' ); ?></th>
    546546        <td aria-live="assertive">
    547             <div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
     547            <div class="destroy-sessions"><button type="button" disabled class="button"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
    548548            <p class="description">
    549549                <?php _e( 'You are only logged in at this location.' ); ?>
    … …  
    555555        <th><?php _e( 'Sessions' ); ?></th>
    556556        <td aria-live="assertive">
    557             <div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
     557            <div class="destroy-sessions"><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
    558558            <p class="description">
    559559                <?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
    … …  
    565565        <th><?php _e( 'Sessions' ); ?></th>
    566566        <td>
    567             <p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
     567            <p><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
    568568            <p class="description">
    569569                <?php

  • trunk/src/wp-admin/user-new.php

    r38329 r38672  
    422422        <td>
    423423            <input class="hidden" value=" " /><!-- #24364 workaround -->
    424             <button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
     424            <button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
    425425            <div class="wp-pwd hide-if-js">
    426426                <?php $initial_password = wp_generate_password( 24 ); ?>
    … …  
    428428                    <input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
    429429                </span>
    430                 <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
     430                <button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
    431431                    <span class="dashicons dashicons-hidden"></span>
    432432                    <span class="text"><?php _e( 'Hide' ); ?></span>
    433433                </button>
    434                 <button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
     434                <button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
    435435                    <span class="text"><?php _e( 'Cancel' ); ?></span>
    436436                </button>

  • trunk/src/wp-admin/widgets.php

    r37914 r38672  
    316316<?php
    317317    } else {
    318         submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
    319     }
    320     submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
     318        submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
     319    }
     320    submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false ); ?>
    321321    <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
    322322    <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
    … …  
    501501    <ul class="widgets-chooser-sidebars"></ul>
    502502    <div class="widgets-chooser-actions">
    503         <button class="button-secondary"><?php _e( 'Cancel' ); ?></button>
    504         <button class="button-primary"><?php _e( 'Add Widget' ); ?></button>
     503        <button class="button widgets-chooser-cancel"><?php _e( 'Cancel' ); ?></button>
     504        <button class="button button-primary widgets-chooser-add"><?php _e( 'Add Widget' ); ?></button>
    505505    </div>
    506506</div>

  • trunk/src/wp-includes/class-wp-customize-nav-menus.php

    r38618 r38672  
    915915                    <p class="button-controls">
    916916                        <span class="add-to-menu">
    917                             <input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
     917                            <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
    918918                            <span class="spinner"></span>
    919919                        </span>

  • trunk/src/wp-includes/class-wp-customize-widgets.php

    r37539 r38672  
    713713                </ul>
    714714                <div class="move-widget-actions">
    715                     <button class="move-widget-btn button-secondary" type="button">{btn}</button>
     715                    <button class="move-widget-btn button" type="button">{btn}</button>
    716716                </div>
    717717            </div>'

  • trunk/src/wp-includes/customize/class-wp-customize-nav-menu-control.php

    r38080 r38672  
    4949    public function content_template() {
    5050        ?>
    51         <button type="button" class="button-secondary add-new-menu-item" aria-label="<?php esc_attr_e( 'Add or remove menu items' ); ?>" aria-expanded="false" aria-controls="available-menu-items">
     51        <button type="button" class="button add-new-menu-item" aria-label="<?php esc_attr_e( 'Add or remove menu items' ); ?>" aria-expanded="false" aria-controls="available-menu-items">
    5252            <?php _e( 'Add Items' ); ?>
    5353        </button>

  • trunk/src/wp-includes/customize/class-wp-customize-new-menu-section.php

    r35385 r38672  
    3737        ?>
    3838        <li id="accordion-section-<?php echo esc_attr( $this->id ); ?>" class="accordion-section-new-menu">
    39             <button type="button" class="button-secondary add-new-menu-item add-menu-toggle" aria-expanded="false">
     39            <button type="button" class="button add-new-menu-item add-menu-toggle" aria-expanded="false">
    4040                <?php echo esc_html( $this->title ); ?>
    4141            </button>

  • trunk/src/wp-includes/customize/class-wp-widget-area-customize-control.php

    r35636 r38672  
    5858        $id = 'reorder-widgets-desc-' . str_replace( array( '[', ']' ), array( '-', '' ), $this->id );
    5959        ?>
    60         <button type="button" class="button-secondary add-new-widget" aria-expanded="false" aria-controls="available-widgets">
     60        <button type="button" class="button add-new-widget" aria-expanded="false" aria-controls="available-widgets">
    6161            <?php _e( 'Add a Widget' ); ?>
    6262        </button>

  • trunk/src/wp-includes/general-template.php

    r38495 r38672  
    482482            ' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
    483483            <p class="login-submit">
    484                 <input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" />
     484                <input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" />
    485485                <input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
    486486            </p>

  • trunk/tests/qunit/fixtures/customize-menus.js

    r38049 r38672  
    379379    'type': 'new_menu',
    380380    'title': 'Add a Menu',
    381     'content': '<li id="accordion-section-add_menu" class="accordion-section-new-menu">\n\t\t\t<button type="button" class="button-secondary add-new-menu-item add-menu-toggle" aria-expanded="false">\n\t\t\t\tAdd a Menu\t\t\t<\/button>\n\t\t\t<ul class="new-menu-section-content"><\/ul>\n\t\t<\/li>',
     381    'content': '<li id="accordion-section-add_menu" class="accordion-section-new-menu">\n\t\t\t<button type="button" class="button add-new-menu-item add-menu-toggle" aria-expanded="false">\n\t\t\t\tAdd a Menu\t\t\t<\/button>\n\t\t\t<ul class="new-menu-section-content"><\/ul>\n\t\t<\/li>',
    382382    'active': true,
    383383    'instanceNumber': 16,

  • trunk/tests/qunit/fixtures/customize-widgets.js

    r35231 r38672  
    5757    'tpl': {
    5858        'widgetReorderNav': '<div class="widget-reorder-nav"><span class="move-widget" tabindex="0">Move to another area&hellip;</span><span class="move-widget-down" tabindex="0">Move down</span><span class="move-widget-up" tabindex="0">Move up</span></div>',
    59         'moveWidgetArea': '<div class="move-widget-area"> <p class="description">Select an area to move this widget into:</p> <ul class="widget-area-select"> <% _.each( sidebars, function ( sidebar ){ %> <li class="" data-id="<%- sidebar.id %>" title="<%- sidebar.description %>" tabindex="0"><%- sidebar.name %></li> <% }); %> </ul> <div class="move-widget-actions"> <button class="move-widget-btn button-secondary" type="button">Move</button> </div> </div>'
     59        'moveWidgetArea': '<div class="move-widget-area"> <p class="description">Select an area to move this widget into:</p> <ul class="widget-area-select"> <% _.each( sidebars, function ( sidebar ){ %> <li class="" data-id="<%- sidebar.id %>" title="<%- sidebar.description %>" tabindex="0"><%- sidebar.name %></li> <% }); %> </ul> <div class="move-widget-actions"> <button class="move-widget-btn button" type="button">Move</button> </div> </div>'
    6060    }
    6161};
    … …  
    131131    'active': true,
    132132    'section': 'sidebar-widgets-sidebar-1',
    133     'content': '<li id="customize-control-sidebars_widgets-sidebar-1" class="customize-control customize-control-sidebar_widgets"> <span class="button-secondary add-new-widget" tabindex="0">    Add a Widget  <\/span> <span class="reorder-toggle" tabindex="0"> <span class="reorder">Reorder<\/span> <span class="reorder-done">Done<\/span> <\/span> <\/li>',
     133    'content': '<li id="customize-control-sidebars_widgets-sidebar-1" class="customize-control customize-control-sidebar_widgets"> <span class="button add-new-widget" tabindex="0">    Add a Widget  <\/span> <span class="reorder-toggle" tabindex="0"> <span class="reorder">Reorder<\/span> <span class="reorder-done">Done<\/span> <\/span> <\/li>',
    134134    'label': '',
    135135    'description': '',

  • trunk/tests/qunit/index.html

    r37714 r38672  
    145145        <!-- Templates for Customizer Menus -->
    146146        <script type="text/html" id="tmpl-customize-control-nav_menu-content">
    147                     <button type="button" class="button-secondary add-new-menu-item" aria-label="Add or remove menu items" aria-expanded="false" aria-controls="available-menu-items">
     147                    <button type="button" class="button add-new-menu-item" aria-label="Add or remove menu items" aria-expanded="false" aria-controls="available-menu-items">
    148148            Add Items       </button>
    149149        <button type="button" class="not-a-button reorder-toggle" aria-label="Reorder menu items" aria-describedby="reorder-items-desc-{{ data.menu_id }}">
    … …  
    360360                    <p class="button-controls">
    361361                        <span class="add-to-menu">
    362                             <input type="submit" class="button-secondary submit-add-to-menu right" value="Add to Menu" name="add-custom-menu-item" id="custom-menu-item-submit">
     362                            <input type="submit" class="button submit-add-to-menu right" value="Add to Menu" name="add-custom-menu-item" id="custom-menu-item-submit">
    363363                            <span class="spinner"></span>
    364364                        </span>
Note: See TracChangeset for help on using the changeset viewer.