WordPress.org
Get WordPress

Make WordPress Core

Changeset 21944


Ignore:
Timestamp:
09/21/2012 07:34:23 PM (12 years ago)
Author:
nacin
Message:

Updates and fixes to the new button styles. By default, buttons are now the same size as they were in 3.4. Then there is a smaller button (designed for minor elements) and a larger button (designed for things like Publish and Save Changes). Better focus styles. props lessbloat. see #21598.

Location:
trunk/wp-admin
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/css/colors-classic.css

    r21878 r21944  
    388388input[type=button],
    389389input[type=submit] {
    390     background: #ececec;
     390    background: #f3f3f3;
    391391    background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
    392392    background-image: -webkit-linear-gradient(top, #fff, #eee);
    … …  
    395395    background-image:   linear-gradient(to bottom, #fff, #eee);
    396396    border-color: #ccc;
    397     -webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
    398     box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
     397    -webkit-box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
     398    box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
    399399    color: #464646;
    400400    text-shadow: 1px 1px 0 #fff;
    … …  
    414414.submit input.focus,
    415415.submit input:focus,
     416input[type=button].focus,
    416417input[type=button]:focus,
    417 input[type=submit].focus,
    418418input[type=submit]:focus {
    419     background: #ececec;
    420     background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
    421     background-image: -webkit-linear-gradient(top, #fff, #eee);
    422     background-image:    -moz-linear-gradient(top, #fff, #eee);
    423     background-image:      -o-linear-gradient(top, #fff, #eee);
    424     background-image:   linear-gradient(to bottom, #fff, #eee);
     419    background: #f3f3f3;
     420    background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f3f3f3));
     421    background-image: -webkit-linear-gradient(top, #fff, #f3f3f3);
     422    background-image:    -moz-linear-gradient(top, #fff, #f3f3f3);
     423    background-image:      -o-linear-gradient(top, #fff, #f3f3f3);
     424    background-image:   linear-gradient(to bottom, #fff, #f3f3f3);
    425425    border-color: #bbb;
    426     -webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
    427     box-shadow: 0px 1px 1px rgba(0,0,0,.1);
     426    -webkit-box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
     427    box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
    428428    color: #000;
     429}
     430
     431.button.focus,
     432.button:focus,
     433.button-secondary.focus,
     434.button-secondary:focus,
     435.submit input.focus,
     436.submit input:focus,
     437input[type=button].focus,
     438input[type=button]:focus,
     439input[type=submit]:focus {
     440    border-color: #999;
     441    -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
     442    box-shadow: 1px 1px 1px rgba(0,0,0,.2);
    429443}
    430444
    … …  
    447461    -webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
    448462    box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
    449 }
    450 
    451 .button.focus,
    452 .button:focus,
    453 .button-secondary.focus,
    454 .button-secondary:focus,
    455 .submit input.focus,
    456 .submit input:focus,
    457 input[type=button].focus,
    458 input[type=submit]:focus {
    459     border-color: #aaa;
    460463}
    461464
    … …  
    499502}
    500503
     504input.button-primary.focus,
     505input.button-primary:focus,
     506button.button-primary:focus,
     507a.button-primary:focus {
     508    border-color: #0e3950;
     509    -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
     510    box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
     511}
     512
    501513input.button-primary.active,
    502514input.button-primary:active,
    … …  
    515527}
    516528
    517 input.button-primary.focus,
    518 input.button-primary:focus,
    519 button.button-primary:focus,
    520 a.button-primary:focus {
    521     border-color: #124560;
    522 }
    523 
    524529.button-disabled,
    525530.button[disabled],
    … …  
    541546    -webkit-box-shadow: none !important;
    542547    box-shadow:         none !important;
     548}
     549
     550.button-primary-disabled:hover,
     551.button-primary[disabled]:hover {
     552    text-shadow: none;
    543553}
    544554

  • trunk/wp-admin/css/colors-fresh.css

    r21878 r21944  
    379379input[type=button],
    380380input[type=submit] {
    381     background: #ececec;
     381    background: #f3f3f3;
    382382    background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
    383383    background-image: -webkit-linear-gradient(top, #fff, #eee);
    … …  
    386386    background-image:   linear-gradient(to bottom, #fff, #eee);
    387387    border-color: #ccc;
    388     -webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
    389     box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
     388    -webkit-box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
     389    box-shadow: inset 0 0 1px 2px rgba(255,255,255, 0.9);
    390390    color: #464646;
    391391    text-shadow: 1px 1px 0 #fff;
    … …  
    408408input[type=button]:focus,
    409409input[type=submit]:focus {
    410     background: #ececec;
    411     background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
    412     background-image: -webkit-linear-gradient(top, #fff, #eee);
    413     background-image:    -moz-linear-gradient(top, #fff, #eee);
    414     background-image:      -o-linear-gradient(top, #fff, #eee);
    415     background-image:   linear-gradient(to bottom, #fff, #eee);
     410    background: #f3f3f3;
     411    background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f3f3f3));
     412    background-image: -webkit-linear-gradient(top, #fff, #f3f3f3);
     413    background-image:    -moz-linear-gradient(top, #fff, #f3f3f3);
     414    background-image:      -o-linear-gradient(top, #fff, #f3f3f3);
     415    background-image:   linear-gradient(to bottom, #fff, #f3f3f3);
    416416    border-color: #bbb;
    417     -webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
    418     box-shadow: 0px 1px 1px rgba(0,0,0,.1);
     417    -webkit-box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
     418    box-shadow: inset 0 0 1px 2px #fff, 0px 1px 1px rgba(0,0,0,.1);
    419419    color: #000;
     420}
     421
     422.button.focus,
     423.button:focus,
     424.button-secondary.focus,
     425.button-secondary:focus,
     426.submit input.focus,
     427.submit input:focus,
     428input[type=button].focus,
     429input[type=button]:focus,
     430input[type=submit]:focus {
     431    border-color: #999;
     432    -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
     433    box-shadow: 1px 1px 1px rgba(0,0,0,.2);
    420434}
    421435
    422436.button.active,
    423437.button:active,
    424 .small.active,
    425 .small:active,
    426438.button-secondary.active,
    427439.button-secondary:active,
    … …  
    440452    -webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
    441453    box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
    442 }
    443 
    444 .button.focus,
    445 .button:focus,
    446 .button-secondary.focus,
    447 .button-secondary:focus,
    448 .submit input.focus,
    449 .submit input:focus,
    450 input[type=button].focus,
    451 input[type=button]:focus,
    452 input[type=submit]:focus {
    453     border-color: #aaa;
    454454}
    455455
    … …  
    493493}
    494494
     495input.button-primary.focus,
     496input.button-primary:focus,
     497button.button-primary:focus,
     498a.button-primary:focus {
     499    border-color: #0e3950;
     500    -webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
     501    box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 1px 1px 2px rgba(0,0,0,.4);
     502}
     503
    495504input.button-primary.active,
    496505input.button-primary:active,
    … …  
    509518}
    510519
    511 input.button-primary.focus,
    512 input.button-primary:focus,
    513 button.button-primary:focus,
    514 a.button-primary:focus {
    515     border-color: #124560;
    516 }
    517 
    518520.button-disabled,
    519521.button[disabled],
    … …  
    535537    -webkit-box-shadow: none !important;
    536538    box-shadow:         none !important;
     539}
     540
     541.button-primary-disabled:hover,
     542.button-primary[disabled]:hover {
     543    text-shadow: none;
    537544}
    538545

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

    r21592 r21944  
    158158#customize-header-actions .button-primary {
    159159    float: right;
    160     margin-top: 11px;
     160    margin-top: 10px;
    161161}
    162162

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

    r21916 r21944  
    784784    text-decoration: none;
    785785    font-size: 12px;
    786     line-height: 15px;
     786    line-height: 17px;
     787    height: 15px;
    787788    margin: 0;
    788     padding: 0.5em 0.8em 0.4em;
     789    padding: 0.25em 0.8em 0.35em;
    789790    cursor: pointer;
    790791    border-width: 1px;
    … …  
    798799}
    799800
     801.button.button-large,
     802.button.button-primary {
     803    padding: 0.4em 0.8em 0.5em;
     804}
     805
    800806.button.button-small {
    801     padding: 3px .8em 2px;
    802 }
    803 
    804 .button.button-large {
    805     font-size: 14px;
    806     padding: 0.6em 1em 0.5em;
    807 }
    808 
    809 .button.button-tiny {
    810     padding: .2em .8em;
    811     font-size: 11px;
     807    padding: 0.15em 0.8em 0.17em;
     808}
     809
     810.button.regular {
     811    padding: 0.25em 0.8em 0.35em !important;
    812812}
    813813
    … …  
    844844#doaction2,
    845845#post-query-submit {
    846     margin-right: 8px;
     846    margin: 1px 8px 0 0;
    847847}
    848848
    849849.tablenav .actions select {
     850    float: left;
     851    margin-right: 6px;
    850852    max-width: 200px;
    851853}
    … …  
    893895    float: right;
    894896    margin: 0;
     897}
     898
     899.search-box input[name="s"], #search-plugins input[name="s"], .tagsdiv .newtag {
     900    float: left;
     901    height: 2em;
     902    margin: 0 4px 0 0;
    895903}
    896904
    … …  
    24832491
    24842492.tablenav .actions {
     2493    overflow: hidden;
    24852494    padding: 2px 8px 0 0;
    24862495}
    … …  
    58495858
    58505859#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input {
    5851     margin: 0;
     5860    margin: 0 5px 0 0;
    58525861}
    58535862
    … …  
    61066115
    61076116#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
    6108     margin: 0 1em 0 0;
     6117    margin: 0 0.7em 0 1px;
    61096118}
    61106119

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

    r21070 r21944  
    261261        <input type="hidden" name="action" value="save" />
    262262        <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
    263         <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
     263        <?php submit_button( __( 'Upload' ), 'small', 'submit', false ); ?>
    264264    </p>
    265265    <?php

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

    r21508 r21944  
    559559        <input type="hidden" name="action" value="save" />
    560560        <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
    561         <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
     561        <?php submit_button( __( 'Upload' ), 'small', 'submit', false ); ?>
    562562    </p>
    563563    <?php

  • trunk/wp-admin/edit-form-advanced.php

    r21789 r21944  
    295295$shortlink = wp_get_shortlink($post->ID, 'post');
    296296if ( !empty($shortlink) )
    297     $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-tiny" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
     297    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
    298298
    299299if ( $post_type_object->public && ! ( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>

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

    r21789 r21944  
    225225            </select>
    226226<?php
    227             submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
     227            submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
    228228        }
    229229
    … …  
    231231            wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
    232232            $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
    233             submit_button( $title, 'small apply', 'delete_all', false );
     233            submit_button( $title, 'apply', 'delete_all', false );
    234234        }
    235235        do_action( 'manage_comments_nav', $comment_status );

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

    r21914 r21944  
    7070            );
    7171            wp_dropdown_categories( $dropdown_options );
    72             submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
     72            submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
    7373?>
    7474        </div>

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

    r21914 r21944  
    219219    <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
    220220    <input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
    221     <?php submit_button( $text, 'small', false, false, array('id' => 'search-submit') ); ?>
     221    <?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
    222222</p>
    223223<?php
    … …  
    302302        echo "</select>\n";
    303303
    304         submit_button( __( 'Apply' ), 'small action', false, false, array( 'id' => "doaction$two" ) );
     304        submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) );
    305305        echo "\n";
    306306    }

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

    r21914 r21944  
    9393
    9494            do_action( 'restrict_manage_posts' );
    95             submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
     95            submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
    9696        }
    9797
    … …  
    9999            submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
    100100        } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
    101             submit_button( __( 'Empty Trash' ), 'small apply', 'delete_all', false );
     101            submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
    102102        } ?>
    103103        </div>

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

    r21914 r21944  
    216216            }
    217217            do_action( 'restrict_manage_posts' );
    218             submit_button( __( 'Filter' ), 'small', false, false, array( 'id' => 'post-query-submit' ) );
     218            submit_button( __( 'Filter' ), 'button', false, false, array( 'id' => 'post-query-submit' ) );
    219219        }
    220220
    221221        if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
    222             submit_button( __( 'Empty Trash' ), 'small apply', 'delete_all', false );
     222            submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
    223223        }
    224224?>

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

    r21894 r21944  
    440440        <p>
    441441            <input type="search" name="s" value="" size="30" autocomplete="off" />
    442             <?php submit_button( __( 'Search Users' ), 'small', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
     442            <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
    443443        </p>
    444444    </form>
    … …  
    447447        <p>
    448448            <input type="search" name="s" value="" size="30" autocomplete="off" />
    449             <?php submit_button( __( 'Search Sites' ), 'small', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
     449            <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
    450450        </p>
    451451    </form>

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

    r21917 r21944  
    18831883<?php } ?>
    18841884
    1885 <?php submit_button( __( 'Filter &#187;' ), 'secondary', 'post-query-submit', false ); ?>
     1885<?php submit_button( __( 'Filter &#187;' ), 'button', 'post-query-submit', false ); ?>
    18861886
    18871887</div>

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

    r21789 r21944  
    207207        if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
    208208        <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
    209         <?php submit_button( __( 'Schedule' ), 'primary', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
     209        <?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
    210210<?php   else : ?>
    211211        <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
    212         <?php submit_button( __( 'Publish' ), 'primary', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
     212        <?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
    213213<?php   endif;
    214214    else : ?>
    215215        <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
    216         <?php submit_button( __( 'Submit for Review' ), 'primary', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
     216        <?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
    217217<?php
    218218    endif;
    219219} else { ?>
    220220        <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
    221         <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
     221        <input name="save" type="submit" class="button-primary button-large" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
    222222<?php
    223223} ?>
    … …  
    287287        <div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
    288288        <p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
    289         <input type="button" class="button button-tiny tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
     289        <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
    290290    </div>
    291291    <p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
    … …  
    637637<div id="publishing-action">
    638638<?php if ( !empty($link->link_id) ) { ?>
    639     <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update Link') ?>" />
     639    <input name="save" type="submit" class="button-large button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update Link') ?>" />
    640640<?php } else { ?>
    641     <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Add Link') ?>" />
     641    <input name="save" type="submit" class="button-large button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Add Link') ?>" />
    642642<?php } ?>
    643643</div>

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

    r20168 r21944  
    694694                <input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
    695695                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
    696                 <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
     696                <?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 ) ); ?>
    697697            </p>
    698698
    … …  
    925925                <input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
    926926                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
    927                 <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
     927                <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
    928928            </p>
    929929

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

    r21789 r21944  
    131131        <input type="search" name="s" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
    132132        <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
    133         <?php submit_button( __( 'Search Plugins' ), 'small', 'plugin-search-input', false ); ?>
     133        <?php submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false ); ?>
    134134    </form><?php
    135135}

  • trunk/wp-admin/includes/post.php

    r21922 r21944  
    10761076        $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
    10771077        if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
    1078             $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-tiny" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
     1078            $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
    10791079        if ( isset($view_post) )
    1080             $return .= "<span id='view-post-btn'><a href='$permalink' class='button button-tiny'>$view_post</a></span>\n";
     1080            $return .= "<span id='view-post-btn'><a href='$permalink' class='button button-small'>$view_post</a></span>\n";
    10811081
    10821082        $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
    … …  
    11051105    $return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
    11061106    $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
    1107     $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-tiny hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
     1107    $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
    11081108    $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
    11091109    if ( isset($view_post) )
    1110         $return .= "<span id='view-post-btn'><a href='$view_link' class='button button-tiny'>$view_post</a></span>\n";
     1110        $return .= "<span id='view-post-btn'><a href='$view_link' class='button button-small'>$view_post</a></span>\n";
    11111111
    11121112    $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);

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

    r21883 r21944  
    16521652        $type = explode( ' ', $type );
    16531653
    1654     $button_shorthand = array( 'primary', 'tiny', 'small', 'large' );
     1654    $button_shorthand = array( 'primary', 'small', 'large' );
    16551655    $classes = array( 'button' );
    16561656    foreach ( $type as $t ) {

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

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

  • trunk/wp-admin/js/post.js

    r21921 r21944  
    569569
    570570            $('#view-post-btn').hide();
    571             b.html('<a href="#" class="save button button-tiny">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
     571            b.html('<a href="#" class="save button button-small">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
    572572            b.children('.save').click(function() {
    573573                var new_slug = e.children('input').val();

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

    r21703 r21944  
    7575    if ( $show_buttons ) {
    7676        if ( $first_pass ) {
    77             submit_button( $submit, $current ? 'button' : 'primary', 'upgrade', false );
     77            submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false );
    7878            $first_pass = false;
    7979        } else {
Note: See TracChangeset for help on using the changeset viewer.