diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 064dfb08e3..b55fa0cc07 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -237,34 +237,44 @@ table.fixed td { width: 98%; } -button, +.button, input[type="reset"], input[type="button"], input[type="submit"] { - padding: 2px 8px; + padding: 0 8px; + line-height: 20px; + height: auto; } -button.button-large, +.button.button-large, input[type="reset"].button-large, input[type="button"].button-large, input[type="submit"].button-large { - padding: 4px 12px; + padding: 0 10px; + line-height: 24px; + height: auto; } -button.button-small, +.button.button-small, input[type="reset"].button-small, input[type="button"].button-small, input[type="submit"].button-small { - padding: 0 8px; + padding: 0 6px; + line-height: 16px; + height: auto; } a.button { margin: 1px; - padding: 3px 8px; + padding: 1px 9px 2px; +} + +a.button.button-large { + padding: 1px 11px 2px; } a.button.button-small { - padding: 1px 8px; + padding: 1px 7px 2px; } #screen-options-wrap { diff --git a/wp-admin/css/install.css b/wp-admin/css/install.css index abfe42fa8d..502efa557c 100644 --- a/wp-admin/css/install.css +++ b/wp-admin/css/install.css @@ -70,49 +70,9 @@ abbr { text-align: left; padding: 0; } - -.submit input, -.button, -.button-secondary { - font-family: sans-serif; - text-decoration: none; - font-size: 14px !important; - line-height: 16px; - padding: 6px 12px; - cursor: pointer; - border: 1px solid #bbb; - color: #464646; - -webkit-border-radius: 15px; - border-radius: 15px; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - background: #f2f2f2; - background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff)); - background-image: -webkit-linear-gradient(bottom, #ededed, #fff); - background-image: -moz-linear-gradient(bottom, #ededed, #fff); - background-image: -o-linear-gradient(bottom, #ededed, #fff); - background-image: linear-gradient(to top, #ededed, #fff); +.step .button-large { + font-size: 14px; } - -.button:hover, -.button-secondary:hover, -.submit input:hover { - color: #000; - border-color: #666; -} - -.button:active, -.submit input:active, -.button-secondary:active { - background: #eee; - background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff)); - background-image: -webkit-linear-gradient(top, #ededed, #fff); - background-image: -moz-linear-gradient(top, #ededed, #fff); - background-image: -o-linear-gradient(top, #ededed, #fff); - background-image: linear-gradient(to bottom, #ededed, #fff); -} - textarea { border: 1px solid #dfdfdf; -webkit-border-radius: 3px; diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index c3e3eb4c88..5b5419b287 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -2262,9 +2262,11 @@ html.wp-toolbar { } .welcome-panel .welcome-button { - margin: -9px 0 3px; - padding: 1em 3em; - font: normal 15px/1 sans-serif; + font: normal 15px sans-serif; + height: 46px; + line-height: 44px; + margin: -9px 0 3px; + padding: 0 36px; } .welcome-panel-content { diff --git a/wp-admin/install.php b/wp-admin/install.php index e39d1f4fc5..d7e12bdc8e 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -58,7 +58,10 @@ function display_header() { <?php _e( 'WordPress › Installation' ); ?> - + >

WordPress

@@ -134,7 +137,7 @@ function display_setup_form( $error = null ) { -

+

' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __('Log In') . '

' ); + die( '

' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __( 'Log In' ) . '

' ); } $php_version = phpversion(); @@ -241,7 +244,7 @@ switch($step) { -

+

<?php _e( 'WordPress › Database Repair' ); ?> - +

WordPress

@@ -102,9 +105,9 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) ) { else echo '

' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '

'; ?> -

+

-

+

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 5e1cf94784..51c3feb351 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -96,6 +96,7 @@ function setup_config_display_header() { <?php _e( 'WordPress › Setup Configuration File' ); ?> + > @@ -119,7 +120,7 @@ switch($step) {

wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php." ); ?>

-

+

-

+

' . __( 'Try again' ) . ''; + $tryagain_link = '

' . __( 'Try again' ) . ''; if ( empty( $prefix ) ) wp_die( __( 'ERROR: "Table Prefix" must not be empty.' . $tryagain_link ) ); @@ -264,7 +265,7 @@ switch($step) { } ?>

-

+