WordPress.org

Make WordPress Core

Ticket #21598: 21598.4.diff

File 21598.4.diff, 27.7 KB (added by helenyhou, 6 years ago)
  • wp-admin/includes/class-wp-posts-list-table.php

     
    218218                                wp_dropdown_categories( $dropdown_options );
    219219                        }
    220220                        do_action( 'restrict_manage_posts' );
    221                         submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
     221                        submit_button( __( 'Filter' ), 'button button-secondary secondary short', false, false, array( 'id' => 'post-query-submit' ) );
    222222                }
    223223
    224224                if ( $this->is_trash && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
    225                         submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
     225                        submit_button( __( 'Empty Trash' ), 'button button-secondary apply short', 'delete_all', false );
    226226                }
    227227?>
    228228                </div>
  • wp-admin/includes/plugin-install.php

     
    130130                <?php endif; ?>
    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' ), 'button', 'plugin-search-input', false ); ?>
     133                <?php submit_button( __( 'Search Plugins' ), 'button short', 'plugin-search-input', false ); ?>
    134134        </form><?php
    135135}
    136136
  • wp-admin/includes/class-wp-media-list-table.php

     
    9191                        $this->months_dropdown( 'attachment' );
    9292
    9393                        do_action( 'restrict_manage_posts' );
    94                         submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
     94                        submit_button( __( 'Filter' ), 'button button-secondary secondary short', false, false, array( 'id' => 'post-query-submit' ) );
    9595                }
    9696
    9797                if ( $this->detached ) {
    9898                        submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
    9999                } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
    100                         submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
     100                        submit_button( __( 'Empty Trash' ), 'button button-secondary apply short', 'delete_all', false );
    101101                } ?>
    102102                </div>
    103103<?php
  • wp-admin/includes/class-wp-links-list-table.php

     
    6868                                'orderby' => 'name',
    6969                        );
    7070                        wp_dropdown_categories( $dropdown_options );
    71                         submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
     71                        submit_button( __( 'Filter' ), 'button button-secondary secondary short', false, false, array( 'id' => 'post-query-submit' ) );
    7272?>
    7373                </div>
    7474<?php
  • wp-admin/includes/post.php

     
    10761076        if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
    10771077                $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
    10781078                if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
    1079                         $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
     1079                        $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
    10801080                if ( isset($view_post) )
    1081                         $return .= "<span id='view-post-btn'><a href='$permalink' class='button'>$view_post</a></span>\n";
     1081                        $return .= "<span id='view-post-btn'><a href='$permalink' class='button small'>$view_post</a></span>\n";
    10821082
    10831083                $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
    10841084
     
    11051105        $return =  '<strong>' . __('Permalink:') . "</strong>\n";
    11061106        $return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
    11071107        $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
    1108         $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
     1108        $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button small button-highlighted hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
    11091109        $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
    11101110        if ( isset($view_post) )
    1111                 $return .= "<span id='view-post-btn'><a href='$view_link' class='button'>$view_post</a></span>\n";
     1111                $return .= "<span id='view-post-btn'><a href='$view_link' class='button small'>$view_post</a></span>\n";
    11121112
    11131113        $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
    11141114
  • wp-admin/includes/class-wp-users-list-table.php

     
    145145                        <option value=''><?php _e( 'Change role to&hellip;' ) ?></option>
    146146                        <?php wp_dropdown_roles(); ?>
    147147                </select>
    148                 <?php submit_button( __( 'Change' ), 'secondary', 'changeit', false ); ?>
     148                <?php submit_button( __( 'Change' ), 'button button-secondary secondary short', 'changeit', false ); ?>
    149149        </div>
    150150<?php
    151151        }
  • wp-admin/includes/dashboard.php

     
    439439        <form action="<?php echo network_admin_url('users.php'); ?>" method="get">
    440440                <p>
    441441                        <input type="search" name="s" value="" size="30" autocomplete="off" />
    442                         <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
     442                        <?php submit_button( __( 'Search Users' ), 'button short', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
    443443                </p>
    444444        </form>
    445445
    446446        <form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
    447447                <p>
    448448                        <input type="search" name="s" value="" size="30" autocomplete="off" />
    449                         <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
     449                        <?php submit_button( __( 'Search Sites' ), 'button short', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
    450450                </p>
    451451        </form>
    452452<?php
  • wp-admin/includes/class-wp-list-table.php

     
    213213<p class="search-box">
    214214        <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
    215215        <input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
    216         <?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
     216        <?php submit_button( $text, 'button short', false, false, array('id' => 'search-submit') ); ?>
    217217</p>
    218218<?php
    219219        }
     
    300300
    301301                echo "</select>\n";
    302302
    303                 submit_button( __( 'Apply' ), 'button-secondary action', false, false, array( 'id' => "doaction$two" ) );
     303                submit_button( __( 'Apply' ), 'button button-secondary action short', false, false, array( 'id' => "doaction$two" ) );
    304304                echo "\n";
    305305        }
    306306
  • wp-admin/includes/meta-boxes.php

     
    288288                <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
    289289                <div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
    290290                <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="" />
    291                 <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
     291                <input type="button" class="button tagadd small" value="<?php esc_attr_e('Add'); ?>" /></p>
    292292        </div>
    293293        <p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
    294294        <?php endif; ?>
  • wp-admin/includes/class-wp-plugins-list-table.php

     
    272272                $screen = get_current_screen();
    273273
    274274                if ( ! $screen->is_network && 'recently_activated' == $status )
    275                         submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false );
     275                        submit_button( __( 'Clear List' ), 'button button-secondary secondary short', 'clear-recent-list', false );
    276276                elseif ( 'top' == $which && 'mustuse' == $status )
    277277                        echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
    278278                elseif ( 'top' == $which && 'dropins' == $status )
  • wp-admin/includes/class-wp-comments-list-table.php

     
    224224                        ?>
    225225                        </select>
    226226<?php
    227                         submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
     227                        submit_button( __( 'Filter' ), 'button button-secondary short', false, false, array( 'id' => 'post-query-submit' ) );
    228228                }
    229229
    230230                if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
    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, 'button-secondary apply', 'delete_all', false );
     233                        submit_button( $title, 'button button-secondary apply short', 'delete_all', false );
    234234                }
    235235                do_action( 'manage_comments_nav', $comment_status );
    236236                echo '</div>';
  • wp-admin/includes/template.php

     
    555555</tr>
    556556
    557557<tr><td colspan="2" class="submit">
    558 <?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta', 'addmeta', false, array( 'id' => 'addmetasub' ) ); ?>
     558<?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta button', 'addmeta', false, array( 'id' => 'addmetasub' ) ); ?>
    559559<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
    560560</td></tr>
    561561</tbody>
  • wp-admin/js/post.js

     
    558558                        var i, c = 0, e = $('#editable-post-name'), revert_e = e.html(), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html();
    559559
    560560                        $('#view-post-btn').hide();
    561                         b.html('<a href="#" class="save button">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
     561                        b.html('<a href="#" class="save button small major">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
    562562                        b.children('.save').click(function() {
    563563                                var new_slug = e.children('input').val();
    564564                                if ( new_slug == $('#editable-post-name-full').text() ) {
  • wp-admin/edit-form-advanced.php

     
    290290$sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
    291291$shortlink = wp_get_shortlink($post->ID, 'post');
    292292if ( !empty($shortlink) )
    293     $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
     293    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
    294294
    295295if ( $post_type_object->public && ! ( 'pending' == $post->post_status && !current_user_can( $post_type_object->cap->publish_posts ) ) ) { ?>
    296296        <div id="edit-slug-box">
  • wp-admin/css/colors-fresh.css

     
    372372.button-secondary,
    373373.submit input,
    374374input[type=button],
    375 input[type=submit] {
    376         border-color: #bbb;
     375input[type=submit],
     376.button:focus,
     377.button-secondary:focus,
     378.submit input:focus,
     379input[type=button]:focus,
     380input[type=submit]:focus {
     381        border-color: #ccc;
     382        background: #ececec;
     383        background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
     384        background-image: -webkit-linear-gradient(top, #fff, #eee);
     385        background-image:    -moz-linear-gradient(top, #fff, #eee);
     386        background-image:      -o-linear-gradient(top, #fff, #eee);
     387        background-image:   linear-gradient(to bottom, #fff, #eee);
    377388        color: #464646;
     389        text-shadow: 1px 1px 0 #fff;
    378390}
    379391
    380392.button:hover,
    381393.button-secondary:hover,
    382394.submit input:hover,
    383395input[type=button]:hover,
    384 input[type=submit]:hover {
     396input[type=submit]:hover,
     397.button:active,
     398.button-secondary:active,
     399.submit input:active,
     400input[type=button]:active,
     401input[type=submit]:active,
     402.button:focus,
     403.button-secondary:focus,
     404.submit input:focus,
     405input[type=button]:focus,
     406input[type=submit]:focus {
     407        border-color: #bbb;
     408        box-shadow: 0px 1px 2px rgba(0,0,0,.2);
    385409        color: #000;
    386         border-color: #666;
    387410}
    388411
    389 .button,
    390 .submit input,
    391 .button-secondary {
    392         text-shadow: 0 1px 0 #fff;
    393         background: #f2f2f2;
    394         background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff));
    395         background-image: -webkit-linear-gradient(bottom, #ededed, #fff);
    396         background-image:    -moz-linear-gradient(bottom, #ededed, #fff);
    397         background-image:      -o-linear-gradient(bottom, #ededed, #fff);
    398         background-image: linear-gradient(to top, #ededed, #fff);
    399 }
    400 
    401412.button:active,
    402413.submit input:active,
    403414.button-secondary:active {
    404415        background: #eee;
    405         background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
    406         background-image: -webkit-linear-gradient(top, #ededed, #fff);
    407         background-image:    -moz-linear-gradient(top, #ededed, #fff);
    408         background-image:      -o-linear-gradient(top, #ededed, #fff);
    409         background-image: linear-gradient(to bottom, #ededed, #fff);
     416        background-image: -webkit-gradient(linear, left top, left bottom, from(#e5e5e5), to(#f9f9f9));
     417        background-image: -webkit-linear-gradient(top, #e5e5e5, #f9f9f9);
     418        background-image:    -moz-linear-gradient(top, #e5e5e5, #f9f9f9);
     419        background-image:      -o-linear-gradient(top, #e5e5e5, #f9f9f9);
     420        background-image:   linear-gradient(to bottom, #e5e5e5, #f9f9f9);
     421        color: #000;
    410422}
    411423
    412424input.button-primary,
    413425button.button-primary,
    414426a.button-primary {
    415         border-color: #298cba;
    416         font-weight: bold;
     427        border-color: #21759b;
     428        border-bottom-color: #1e6a8d;
     429        text-decoration: none;
     430        text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
    417431        color: #fff;
    418         text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
    419         background: #21759b;
    420         background-image: -webkit-gradient(linear, left bottom, left top, from(#227199), to(#298cba));
    421         background-image: -webkit-linear-gradient(bottom, #227199, #298cba);
    422         background-image:    -moz-linear-gradient(bottom, #227199, #298cba);
    423         background-image:      -o-linear-gradient(bottom, #227199, #298cba);
    424         background-image: linear-gradient(to top, #227199, #298cba);
     432        background-color: #21759b;
     433        background-image: -webkit-gradient(linear, left top, left bottom, from(#2a95c5), to(#21759b));
     434        background-image: -webkit-linear-gradient(top, #2a95c5, #21759b);
     435        background-image:    -moz-linear-gradient(top, #2a95c5, #21759b);
     436        background-image:      -o-linear-gradient(top, #2a95c5, #21759b);
     437        background-image:   linear-gradient(to bottom, #2a95c5, #21759b);
    425438}
    426439
    427 input.button-primary:active,
    428 button.button-primary:active,
    429 a.button-primary:active {
    430         color: #eaf2fa;
    431         background: #298cba;
    432         background-image: -webkit-gradient(linear, left top, left bottom, from(#227199), to(#298cba));
    433         background-image: -webkit-linear-gradient(top, #227199, #298cba);
    434         background-image:    -moz-linear-gradient(top, #227199, #298cba);
    435         background-image:      -o-linear-gradient(top, #227199, #298cba);
    436         background-image: linear-gradient(to bottom, #227199, #298cba);
    437 }
    438 
    439440input.button-primary:hover,
    440441button.button-primary:hover,
    441442a.button-primary:hover,
    442 a.button-primary:focus,
     443input.button-primary:focus,
     444button.button-primary:focus,
     445a.button-primary:focus {
     446        border-color: #1b607f;
     447        color: #fff;
     448        text-shadow: -1px -1px 0 rgba(0,0,0,0.4);
     449        background-color: #278ab7;
     450        background-image: -webkit-gradient(linear, left top, left bottom, from(#2e9fd2), to(#21759b));
     451        background-image: -webkit-linear-gradient(top, #2e9fd2, #21759b);
     452        background-image:    -moz-linear-gradient(top, #2e9fd2, #21759b);
     453        background-image:      -o-linear-gradient(top, #2e9fd2, #21759b);
     454        background-image:   linear-gradient(to bottom, #2e9fd2, #21759b);
     455}
     456
     457input.button-primary:active,
     458button.button-primary:active,
    443459a.button-primary:active {
    444         border-color: #13455b;
    445         color: #eaf2fa;
     460        border-color: #1b607f;
     461        color: #fff;
     462        background: #1b607f;
     463        background-image: -webkit-gradient(linear, left top, left bottom, from(#21759b), to(#278ab7));
     464        background-image: -webkit-linear-gradient(top, #21759b, #278ab7);
     465        background-image:    -moz-linear-gradient(top, #21759b, #278ab7);
     466        background-image:      -o-linear-gradient(top, #21759b, #278ab7);
     467        background-image:   linear-gradient(to bottom, #21759b, #278ab7);
    446468}
    447469
    448470.button-disabled,
     
    458480.button-primary-disabled,
    459481.button-primary[disabled],
    460482.button-primary:disabled {
    461         color: #9fd0d5 !important;
     483        color: #94cde7 !important;
    462484        background: #298cba !important;
    463485}
    464486
  • wp-admin/css/wp-admin.css

     
    780780.button-secondary,
    781781input.button-secondary,
    782782.button-highlighted,
    783 input.button-highlighted,
    784 #postcustomstuff .submit input {
     783input.button-highlighted {
     784        display: inline-block;
    785785        text-decoration: none;
    786         font-size: 12px !important;
    787         line-height: 13px;
    788         padding: 3px 8px;
     786        font-size: 12px;
     787        line-height: 15px;
     788        margin: 0;
     789        padding: 0.5em .8em;
    789790        cursor: pointer;
    790791        border-width: 1px;
    791792        border-style: solid;
    792         -webkit-border-radius: 11px;
    793         border-radius: 11px;
     793        -webkit-border-radius: 3px;
     794        border-radius: 3px;
     795        -webkit-box-sizing: content-box;
    794796        -moz-box-sizing: content-box;
    795         -webkit-box-sizing: content-box;
    796797        box-sizing: content-box;
     798        white-space: nowrap;
    797799}
    798800
     801input.button-primary,
     802button.button-primary,
     803a.button-primary,
     804.button-highlighted,
     805input.button-highlighted,
     806button.button-highlighted {
     807        font-weight: bold;
     808        letter-spacing: .01em;
     809}
     810
     811.button.short {
     812        padding: 3px .8em;
     813}
     814
     815.button.big {
     816    font-size: 14px;
     817}
     818
     819.button.small {
     820        padding: .2em .8em;
     821        font-size: 11px;
     822}
     823
    799824#minor-publishing-actions input,
    800825#major-publishing-actions input,
    801826#minor-publishing-actions .preview {
    802         min-width: 80px;
    803827        text-align: center;
    804828}
    805829
     
    10141038        list-style: square;
    10151039}
    10161040
    1017 a.button,
    1018 a.button-primary,
    1019 a.button-secondary {
    1020         line-height: 15px;
    1021         padding: 3px 10px;
    1022         white-space: nowrap;
    1023         -webkit-border-radius: 10px;
    1024 }
    1025 
    10261041.approve,
    10271042.unapproved .unapprove {
    10281043        display: none;
     
    28032818
    28042819#titlediv {
    28052820        position: relative;
    2806         margin-bottom: 20px;
     2821        margin-bottom: 10px;
    28072822}
    28082823#titlediv label { cursor: text; }
    28092824
     
    28562871}
    28572872
    28582873#edit-slug-box {
    2859         height: 1em;
    28602874        margin-top: 8px;
    28612875        padding: 0 10px;
    28622876}
    28632877
     2878#edit-slug-box .cancel {
     2879        margin-right: 10px;
     2880        font-size: 11px;
     2881}
     2882
    28642883#editable-post-name-full {
    28652884        display: none;
    28662885}
     
    31583177#postcustom #postcustomstuff .submit {
    31593178        border: 0 none;
    31603179        float: none;
    3161         padding: 5px 8px;
     3180        padding: 0;
    31623181}
    31633182
    31643183#side-sortables #postcustom #postcustomstuff .submit {
     
    31943213        width: 38%;
    31953214}
    31963215
    3197 #postcustomstuff #newmeta .submit {
    3198         padding: 0 8px;
    3199 }
    3200 
    32013216#postcustomstuff .submit input,
    32023217#postcustomstuff table #addmetasub {
    32033218        width: auto;
     
    42144229
    42154230#replysubmit {
    42164231        margin: 0;
    4217         padding: 0 7px 3px;
     4232        padding: 0 5px 3px;
    42184233        text-align: center;
    42194234}
    42204235
     
    46434658.plugins .name,
    46444659#pass-strength-result.strong,
    46454660#pass-strength-result.short,
    4646 .button-highlighted,
    4647 input.button-highlighted,
    46484661#ed_reply_toolbar #ed_reply_strong,
    46494662.item-controls .item-order a,
    46504663.feature-filter .feature-name {
     
    56025615        padding: 0;
    56035616}
    56045617
    5605 #titlediv,
    56065618#poststuff .postarea {
    56075619        margin-bottom: 20px;
    56085620}
     
    60556067}
    60566068
    60576069#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
    6058         margin: 0 1em 0 10px;
     6070        margin: 0 1em 0 5px;
    60596071}
    60606072
    60616073#dashboard-widgets #dashboard_quick_press form p.submit #publish {
     
    62496261
    62506262.login .button-primary {
    62516263        font-size: 13px !important;
    6252         line-height: 16px;
    6253         padding: 3px 10px;
     6264        padding: .4em .8em;
    62546265        float: right;
    62556266}
    62566267
  • wp-admin/css/colors-classic.css

     
    381381.button-secondary,
    382382.submit input,
    383383input[type=button],
    384 input[type=submit] {
    385         border-color: #bbb;
     384input[type=submit],
     385.button:focus,
     386.button-secondary:focus,
     387.submit input:focus,
     388input[type=button]:focus,
     389input[type=submit]:focus {
     390        border-color: #ccc;
     391        background: #ececec;
     392        background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
     393        background-image: -webkit-linear-gradient(top, #fff, #eee);
     394        background-image:    -moz-linear-gradient(top, #fff, #eee);
     395        background-image:      -o-linear-gradient(top, #fff, #eee);
     396        background-image:   linear-gradient(to bottom, #fff, #eee);
    386397        color: #464646;
     398        text-shadow: 1px 1px 0 #fff;
    387399}
    388400
    389401.button:hover,
    390402.button-secondary:hover,
    391403.submit input:hover,
    392404input[type=button]:hover,
    393 input[type=submit]:hover {
     405input[type=submit]:hover,
     406.button:active,
     407.button-secondary:active,
     408.submit input:active,
     409input[type=button]:active,
     410input[type=submit]:active,
     411.button:focus,
     412.button-secondary:focus,
     413.submit input:focus,
     414input[type=button]:focus,
     415input[type=submit]:focus {
     416        border-color: #bbb;
     417        box-shadow: 0px 1px 2px rgba(0,0,0,.2);
    394418        color: #000;
    395         border-color: #666;
    396419}
    397420
    398 .button,
    399 .submit input,
    400 .button-secondary {
    401         text-shadow: 0 1px 0 #fff;
    402         background: #f2f2f2;
    403         background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff));
    404         background-image: -webkit-linear-gradient(bottom, #ededed, #fff);
    405         background-image:    -moz-linear-gradient(bottom, #ededed, #fff);
    406         background-image:      -o-linear-gradient(bottom, #ededed, #fff);
    407         background-image: linear-gradient(to top, #ededed, #fff);
    408 }
    409 
    410421.button:active,
    411422.submit input:active,
    412423.button-secondary:active {
    413424        background: #eee;
    414         background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
    415         background-image: -webkit-linear-gradient(top, #ededed, #fff);
    416         background-image:    -moz-linear-gradient(top, #ededed, #fff);
    417         background-image:      -o-linear-gradient(top, #ededed, #fff);
    418         background-image: linear-gradient(to bottom, #ededed, #fff);
     425        background-image: -webkit-gradient(linear, left top, left bottom, from(#e5e5e5), to(#f9f9f9));
     426        background-image: -webkit-linear-gradient(top, #e5e5e5, #f9f9f9);
     427        background-image:    -moz-linear-gradient(top, #e5e5e5, #f9f9f9);
     428        background-image:      -o-linear-gradient(top, #e5e5e5, #f9f9f9);
     429        background-image:   linear-gradient(to bottom, #e5e5e5, #f9f9f9);
     430        color: #000;
    419431}
    420432
    421433input.button-primary,
    422434button.button-primary,
    423435a.button-primary {
    424         border-color: #298cba;
    425         font-weight: bold;
     436        border-color: #21759b;
     437        border-bottom-color: #1e6a8d;
     438        text-decoration: none;
     439        text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
    426440        color: #fff;
    427         text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
    428         background: #21759b;
    429         background-image: -webkit-gradient(linear, left bottom, left top, from(#227199), to(#298cba));
    430         background-image: -webkit-linear-gradient(bottom, #227199, #298cba);
    431         background-image:    -moz-linear-gradient(bottom, #227199, #298cba);
    432         background-image:      -o-linear-gradient(bottom, #227199, #298cba);
    433         background-image: linear-gradient(to top, #227199, #298cba);
     441        background-color: #21759b;
     442        background-image: -webkit-gradient(linear, left top, left bottom, from(#2a95c5), to(#21759b));
     443        background-image: -webkit-linear-gradient(top, #2a95c5, #21759b);
     444        background-image:    -moz-linear-gradient(top, #2a95c5, #21759b);
     445        background-image:      -o-linear-gradient(top, #2a95c5, #21759b);
     446        background-image:   linear-gradient(to bottom, #2a95c5, #21759b);
    434447}
    435448
    436 input.button-primary:active,
    437 button.button-primary:active,
    438 a.button-primary:active {
    439         color: #eaf2fa;
    440         background: #298cba;
    441         background-image: -webkit-gradient(linear, left top, left bottom, from(#227199), to(#298cba));
    442         background-image: -webkit-linear-gradient(top, #227199, #298cba);
    443         background-image:    -moz-linear-gradient(top, #227199, #298cba);
    444         background-image:      -o-linear-gradient(top, #227199, #298cba);
    445         background-image: linear-gradient(to bottom, #227199, #298cba);
    446 }
    447 
    448449input.button-primary:hover,
    449450button.button-primary:hover,
    450451a.button-primary:hover,
    451 a.button-primary:focus,
     452input.button-primary:focus,
     453button.button-primary:focus,
     454a.button-primary:focus {
     455        border-color: #1b607f;
     456        color: #fff;
     457        text-shadow: -1px -1px 0 rgba(0,0,0,0.4);
     458        background-color: #278ab7;
     459        background-image: -webkit-gradient(linear, left top, left bottom, from(#2e9fd2), to(#21759b));
     460        background-image: -webkit-linear-gradient(top, #2e9fd2, #21759b);
     461        background-image:    -moz-linear-gradient(top, #2e9fd2, #21759b);
     462        background-image:      -o-linear-gradient(top, #2e9fd2, #21759b);
     463        background-image:   linear-gradient(to bottom, #2e9fd2, #21759b);
     464}
     465
     466input.button-primary:active,
     467button.button-primary:active,
    452468a.button-primary:active {
    453         border-color: #13455b;
    454         color: #eaf2fa;
     469        border-color: #1b607f;
     470        color: #fff;
     471        background: #1b607f;
     472        background-image: -webkit-gradient(linear, left top, left bottom, from(#21759b), to(#278ab7));
     473        background-image: -webkit-linear-gradient(top, #21759b, #278ab7);
     474        background-image:    -moz-linear-gradient(top, #21759b, #278ab7);
     475        background-image:      -o-linear-gradient(top, #21759b, #278ab7);
     476        background-image:   linear-gradient(to bottom, #21759b, #278ab7);
    455477}
    456478
    457479.button-disabled,
     
    467489.button-primary-disabled,
    468490.button-primary[disabled],
    469491.button-primary:disabled {
    470         color: #9fd0d5 !important;
     492        color: #94cde7 !important;
    471493        background: #298cba !important;
    472494}
    473495