<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26298] trunk/src: Bring the install/update screens in line with the new admin design.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26298">26298</a></dd>
<dt>Author</dt> <dd>iammattthomas</dd>
<dt>Date</dt> <dd>2013-11-21 00:20:13 +0000 (Thu, 21 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring the install/update screens in line with the new admin design. This affects:
* Creating a wp-config.php file
* Installation
* Database upgrade
* Database repair
* Readme.html
* Network sites actions
What's changed:
* Bring background/text/link/border colours in line with mp6
* Bring fonts in line with mp6 (see note below)
* Switch to device-width for the viewport and tweak margins etc so the layout works nicely on all device sizes
* Switch to the new vector WordPress logo in the header to match the log in screen
* Force table cells into rows in the <782px media query
Fixes <a href="http://core.trac.wordpress.org/ticket/25951">#25951</a>, props johnbillion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcreadmehtml">trunk/src/readme.html</a></li>
<li><a href="#trunksrcwpadmincssinstallcss">trunk/src/wp-admin/css/install.css</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminmaintrepairphp">trunk/src/wp-admin/maint/repair.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcreadmehtml"></a>
<div class="modfile"><h4>Modified: trunk/src/readme.html (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/readme.html 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/readme.html 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><ins>+ <meta name="viewport" content="width=device-width" />
</ins><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx"> <title>WordPress › ReadMe</title>
</span><span class="cx"> <link rel="stylesheet" href="wp-admin/css/install.css?ver=20100228" type="text/css" />
</span></span></pre></div>
<a id="trunksrcwpadmincssinstallcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/install.css (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/install.css 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/wp-admin/css/install.css 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -1,36 +1,38 @@
</span><span class="cx"> html {
</span><del>- background: #f9f9f9;
</del><ins>+ background: #eee;
+ margin: 0 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> body {
</span><span class="cx"> background: #fff;
</span><del>- color: #333;
- font-family: sans-serif;
- margin: 2em auto;
- padding: 1em 2em;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- border: 1px solid #dfdfdf;
</del><ins>+ color: #555;
+ font-family: "Open Sans", sans-serif;
+ margin: 140px auto 25px;
+ padding: 20px 20px 10px 20px;
</ins><span class="cx"> max-width: 700px;
</span><ins>+ -webkit-font-smoothing: subpixel-antialiased;
+ -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+ box-shadow: 0 1px 3px rgba(0,0,0,0.13);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> a {
</span><del>- color: #21759b;
</del><ins>+ color: #0074a2;
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> a:hover {
</span><del>- color: #d54e21;
</del><ins>+ color: #2ea2cc;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> h1 {
</span><del>- border-bottom: 1px solid #dadada;
</del><ins>+ border-bottom: 1px solid #dedede;
</ins><span class="cx"> clear: both;
</span><span class="cx"> color: #666;
</span><del>- font: 24px Georgia, "Times New Roman", Times, serif;
- margin: 30px 0 0 0;
</del><ins>+ font-size: 24px;
+ margin: 30px 0;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> padding-bottom: 7px;
</span><ins>+ font-weight: normal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> h2 {
</span><span class="lines">@@ -44,7 +46,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> code, .code {
</span><del>- font-size: 14px;
</del><ins>+ font-family: Consolas, Monaco, monospace;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul, ol, dl {
</span><span class="lines">@@ -64,25 +66,24 @@
</span><span class="cx"> text-align:center
</span><span class="cx"> }
</span><span class="cx"> #logo a {
</span><del>- background-image: url('../images/wordpress-logo.png?ver=20120216');
- background-size: 274px 63px;
- background-position: top center;
</del><ins>+ background-image: url('../images/wordpress-logo.svg?ver=20131107');
+ background-size: 80px 80px;
+ background-position: center top;
</ins><span class="cx"> background-repeat: no-repeat;
</span><del>- height: 67px;
</del><ins>+ color: #999;
+ height: 80px;
+ font-size: 20px;
+ font-weight: normal;
+ line-height: 1.3em;
+ margin: -130px auto 25px;
+ padding: 0;
+ text-decoration: none;
+ width: 80px;
</ins><span class="cx"> text-indent: -9999px;
</span><span class="cx"> outline: none;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><del>-@media print,
- (-o-min-device-pixel-ratio: 5/4),
- (-webkit-min-device-pixel-ratio: 1.25),
- (min-resolution: 120dpi) {
- #logo a {
- background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
- background-size: 274px 63px;
- }
-}
</del><span class="cx"> .step {
</span><span class="cx"> margin: 20px 0 15px;
</span><span class="cx"> }
</span><span class="lines">@@ -95,10 +96,12 @@
</span><span class="cx"> }
</span><span class="cx"> textarea {
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><del>- -webkit-border-radius: 3px;
- border-radius: 3px;
- font-family: sans-serif;
- width: 695px;
</del><ins>+ font-family: "Open Sans", sans-serif;
+ width: 100%;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box; /* ie8 only */
+ box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .form-table {
</span><span class="lines">@@ -119,7 +122,6 @@
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> text-align: left;
</span><span class="cx"> padding: 16px 20px 10px 0;
</span><del>- border-bottom: 8px solid #fff;
</del><span class="cx"> width: 140px;
</span><span class="cx"> vertical-align: top;
</span><span class="cx"> }
</span><span class="lines">@@ -137,13 +139,16 @@
</span><span class="cx"> .form-table input {
</span><span class="cx"> line-height: 20px;
</span><span class="cx"> font-size: 15px;
</span><del>- padding: 2px;
- border: 1px #dfdfdf solid;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- font-family: sans-serif;
</del><ins>+ padding: 3px 5px;
+ border: 1px solid #ddd;
+ box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+input,
+submit {
+ font-family: "Open Sans", sans-serif;
+}
+
</ins><span class="cx"> .form-table input[type=text],
</span><span class="cx"> .form-table input[type=password] {
</span><span class="cx"> width: 206px;
</span><span class="lines">@@ -216,8 +221,6 @@
</span><span class="cx">
</span><span class="cx"> .message {
</span><span class="cx"> border: 1px solid #c00;
</span><del>- -webkit-border-radius: 3px;
- border-radius: 3px;
</del><span class="cx"> padding: 0.5em 0.7em;
</span><span class="cx"> margin: 5px 0 15px;
</span><span class="cx"> background-color: #ffebe8;
</span><span class="lines">@@ -235,3 +238,57 @@
</span><span class="cx"> #pass2 {
</span><span class="cx"> direction: ltr;
</span><span class="cx"> }
</span><ins>+
+@media only screen and (max-width: 799px) {
+ body {
+ margin-top: 115px;
+ }
+ #logo a {
+ margin: -125px auto 30px;
+ }
+}
+
+@media screen and ( max-width: 782px ) {
+
+ .form-table {
+ margin-top: 0;
+ }
+
+ .form-table th,
+ .form-table td {
+ display: block;
+ width: auto;
+ vertical-align: middle;
+ }
+
+ .form-table th {
+ padding: 20px 0 0;
+ }
+
+ .form-table td {
+ padding: 5px 0;
+ border: 0;
+ margin: 0;
+ }
+
+ textarea,
+ input {
+ font-size: 16px;
+ }
+
+ .form-table td input[type="text"],
+ .form-table td input[type="password"],
+ .form-table td select,
+ .form-table td textarea,
+ .form-table span.description {
+ width: 100%;
+ font-size: 16px;
+ line-height: 1.5;
+ padding: 7px 10px;
+ display: block;
+ max-width: none;
+ box-sizing: border-box;
+ -mox-box-sizing: border-box;
+ }
+
+}
</ins></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/install.php (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/install.php 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/wp-admin/install.php 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><ins>+ <meta name="viewport" content="width=device-width" />
</ins><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx"> <title><?php _e( 'WordPress › Installation' ); ?></title>
</span><span class="cx"> <?php
</span><span class="lines">@@ -249,8 +250,10 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+if ( !wp_is_mobile() ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
</span><ins>+<?php } ?>
</ins><span class="cx"> <?php wp_print_scripts( 'user-profile' ); ?>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunksrcwpadminmaintrepairphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/maint/repair.php (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/maint/repair.php 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/wp-admin/maint/repair.php 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><ins>+ <meta name="viewport" content="width=device-width" />
</ins><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx"> <title><?php _e( 'WordPress › Database Repair' ); ?></title>
</span><span class="cx"> <?php
</span><span class="lines">@@ -26,7 +27,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
</span><del>- echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</del><ins>+ echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
</ins><span class="cx"> } elseif ( isset( $_GET['repair'] ) ) {
</span><span class="cx"> $optimize = 2 == $_GET['repair'];
</span><span class="cx"> $okay = true;
</span><span class="lines">@@ -103,7 +104,7 @@
</span><span class="cx"> $problem_output .= "$table: $problem\n";
</span><span class="cx"> echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
</span><span class="cx"> } else {
</span><del>- echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</del><ins>+ echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/sites.php (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/sites.php 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/wp-admin/network/sites.php 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><ins>+ <meta name="viewport" content="width=device-width" />
</ins><span class="cx"> <title><?php _e( 'WordPress › Confirm your action' ); ?></title>
</span><span class="cx">
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/setup-config.php (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/setup-config.php 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/wp-admin/setup-config.php 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
</span><span class="cx"> <head>
</span><ins>+<meta name="viewport" content="width=device-width" />
</ins><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx"> <title><?php _e( 'WordPress › Setup Configuration File' ); ?></title>
</span><span class="cx"> <link rel="stylesheet" href="css/install.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
</span></span></pre></div>
<a id="trunksrcwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upgrade.php (26297 => 26298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upgrade.php 2013-11-20 23:32:36 UTC (rev 26297)
+++ trunk/src/wp-admin/upgrade.php 2013-11-21 00:20:13 UTC (rev 26298)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><ins>+ <meta name="viewport" content="width=device-width" />
</ins><span class="cx"> <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
</span><span class="cx"> <title><?php _e( 'WordPress › Update' ); ?></title>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>