diff --git a/wp-admin/css/install.css b/wp-admin/css/install.css index c0271ecafc..c186839b2c 100644 --- a/wp-admin/css/install.css +++ b/wp-admin/css/install.css @@ -1 +1 @@ -html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:sans-serif;margin:2em auto;width:700px;padding:1em 2em;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:12px;line-height:18px;}code,.code{font-size:13px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,th{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;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #bbb;-webkit-border-radius:3px;border-radius:3px;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:130px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}.form-table th p{font-weight:normal;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;display:none;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;}body.rtl{font-family:Tahoma,arial;}.rtl h1{font-family:arial;margin:5px -4px 0 0;}.rtl ul,.rtl ol{padding:5px 22px 5px 5px;}.rtl .step,.rtl th,.rtl .form-table th{text-align:right;}.rtl .submit input,.rtl .button,.rtl .button-secondary{margin-right:0;}.rtl #user_login,.rtl #admin_email,.rtl #pass1,.rtl #pass2{direction:ltr;} \ No newline at end of file +html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:sans-serif;margin:2em auto;padding:1em 2em;-webkit-border-radius:3px;border-radius:3px;border:1px solid #dfdfdf;max-width:700px;}a{color:#21759B;text-decoration:none;}a:hover{color:#D54E21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:30px 0 0 0;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:14px;line-height:1.5;}code,.code{font-size:14px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,th{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;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #dfdfdf;-webkit-border-radius:3px;border-radius:3px;font-family:sans-serif;width:695px;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px 20px 10px 0;border-bottom:8px solid #fff;font-size:14px;vertical-align:top;}.form-table th{font-size:14px;text-align:left;padding:16px 20px 10px 0;border-bottom:8px solid #fff;width:130px;vertical-align:top;}.form-table code{line-height:18px;font-size:14px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;border:1px #DFDFDF solid;-webkit-border-radius:3px;border-radius:3px;font-family:sans-serif;}.form-table th p{font-weight:normal;}.form-table.install-success td{vertical-align:middle;padding:16px 20px 10px 0;}.form-table.install-success td p{margin:0;font-size:14px;}.form-table.install-success td code{margin:0;font-size:18px;}#error-page{margin-top:50px;}#error-page p{font-size:14px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;display:none;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;}body.rtl{font-family:Tahoma,arial;}.rtl h1{font-family:arial;margin:5px -4px 0 0;}.rtl ul,.rtl ol{padding:5px 22px 5px 5px;}.rtl .step,.rtl th,.rtl .form-table th{text-align:right;}.rtl .submit input,.rtl .button,.rtl .button-secondary{margin-right:0;}.rtl #user_login,.rtl #admin_email,.rtl #pass1,.rtl #pass2{direction:ltr;} \ No newline at end of file diff --git a/wp-admin/css/install.dev.css b/wp-admin/css/install.dev.css index 03a38c3943..747c7e08e2 100644 --- a/wp-admin/css/install.dev.css +++ b/wp-admin/css/install.dev.css @@ -7,20 +7,20 @@ body { color: #333; font-family: sans-serif; margin: 2em auto; - width: 700px; padding: 1em 2em; - -webkit-border-radius: 11px; - border-radius: 11px; + -webkit-border-radius: 3px; + border-radius: 3px; border: 1px solid #dfdfdf; + max-width: 700px; } a { - color: #2583ad; + color: #21759B; text-decoration: none; } a:hover { - color: #d54e21; + color: #D54E21; } h1 { @@ -28,7 +28,7 @@ h1 { clear: both; color: #666; font: 24px Georgia, "Times New Roman", Times, serif; - margin: 5px 0 0 -4px; + margin: 30px 0 0 0; padding: 0; padding-bottom: 7px; } @@ -39,12 +39,12 @@ h2 { p, li, dd, dt { padding-bottom: 2px; - font-size: 12px; - line-height: 18px; + font-size: 14px; + line-height: 1.5; } code, .code { - font-size: 13px; + font-size: 14px; } ul, ol, dl { @@ -101,9 +101,11 @@ abbr { } textarea { - border: 1px solid #bbb; + border: 1px solid #dfdfdf; -webkit-border-radius: 3px; border-radius: 3px; + font-family: sans-serif; + width: 695px; } .form-table { @@ -114,27 +116,24 @@ textarea { .form-table td { margin-bottom: 9px; - padding: 10px; + padding: 10px 20px 10px 0; border-bottom: 8px solid #fff; - font-size: 12px; + font-size: 14px; + vertical-align: top } .form-table th { - font-size: 13px; + font-size: 14px; text-align: left; - padding: 16px 10px 10px 10px; + padding: 16px 20px 10px 0; border-bottom: 8px solid #fff; width: 130px; vertical-align: top; } -.form-table tr { - background: #f3f3f3; -} - .form-table code { line-height: 18px; - font-size: 18px; + font-size: 14px; } .form-table p { @@ -146,18 +145,37 @@ textarea { line-height: 20px; font-size: 15px; padding: 2px; + border: 1px #DFDFDF solid; + -webkit-border-radius: 3px; + border-radius: 3px; + font-family: sans-serif; } .form-table th p { font-weight: normal; } +.form-table.install-success td { + vertical-align: middle; + padding: 16px 20px 10px 0; +} + +.form-table.install-success td p { + margin: 0; + font-size: 14px; +} + +.form-table.install-success td code { + margin: 0; + font-size: 18px; +} + #error-page { margin-top: 50px; } #error-page p { - font-size: 12px; + font-size: 14px; line-height: 18px; margin: 25px 0 20px; } diff --git a/wp-admin/install.php b/wp-admin/install.php index 68965c975c..edbc8c0136 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -130,6 +130,7 @@ function display_setup_form( $error = null ) {

+ @@ -220,10 +221,10 @@ switch($step) {

- +
- + diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 070db9675e..efc158fc89 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -130,7 +130,7 @@ switch($step) { - + diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 2a28e7d9fb..106122dd15 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2851,27 +2851,38 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) { body { background: #fff; color: #333; - font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + font-family: sans-serif; margin: 2em auto; - width: 700px; padding: 1em 2em; - -webkit-border-radius: 11px; - border-radius: 11px; + -webkit-border-radius: 3px; + border-radius: 3px; border: 1px solid #dfdfdf; + max-width: 700px; } #error-page { margin-top: 50px; } #error-page p { - font-size: 12px; - line-height: 18px; + font-size: 14px; + line-height: 1.5; margin: 25px 0 20px; } #error-page code { font-family: Consolas, Monaco, monospace; } + ul li { + margin-bottom: 10px; + font-size: 14px ; + } + a { + color: #21759B; + text-decoration: none; + } + a:hover { + color: #D54E21; + } - body { font-family: Tahoma, arial; } + body { font-family: Tahoma, Arial; } diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index c841b94b9c..9ba7b935c8 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -448,7 +448,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin'), $colors_version ); $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20111110' ); - $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20111107' ); // Readme as well + $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20111115' ); // Readme as well $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); diff --git a/wp-load.php b/wp-load.php index 8c23992f1d..b9ae7e8a08 100644 --- a/wp-load.php +++ b/wp-load.php @@ -53,7 +53,7 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) { require_once( ABSPATH . '/wp-includes/functions.php' ); require_once( ABSPATH . '/wp-includes/plugin.php' ); $text_direction = /*WP_I18N_TEXT_DIRECTION*/'ltr'/*/WP_I18N_TEXT_DIRECTION*/; - wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

Create a Configuration File"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/'WordPress › Error'/*/WP_I18N_ERROR_TITLE*/, array('text_direction' => $text_direction)); + wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"

There doesn't seem to be a wp-config.php file. I need this before we can get started.

Need more help? We got it.

You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

Create a Configuration File

"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/'WordPress › Error'/*/WP_I18N_ERROR_TITLE*/, array('text_direction' => $text_direction)); }
...and MySQL password....and your MySQL password.