Skip to content
Permalink
Browse files

Upgrade/Install: Bring some consistency to installation screen styles.

* Include `forms.css` and `l10n.css`, for consistency with login screen and other admin screens.
* Remove redundant `@import` directives from `login.css` for files already declared as dependencies.
* Adjust margin on password strength meter for consistency with other fields.
* Increase font size for "You will need this password to log in" notice.
* Fix misaligned icon on "Hide" button for the password.

Props iseulde, dan@micamedia.com, bassgang, cdog, johnbillion, nmenescardi, mukesh27, alpipego, SergeyBiryukov.
Merges [45673] to the 5.2 branch.
Fixes #35776, #43483, #47757, #47758.

git-svn-id: https://develop.svn.wordpress.org/branches/5.2@45844 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
SergeyBiryukov committed Aug 19, 2019
1 parent dd5e834 commit da1178b30a98a09d91f9d13dbb456391f8c3b340
@@ -464,7 +464,7 @@ fieldset label,
background-color: #eee;
border: 1px solid #ddd;
color: #23282d;
margin: -1px 0 5px;
margin: -1px 1px 5px;
padding: 3px 5px;
text-align: center;
width: 25em;
@@ -522,7 +522,7 @@ fieldset label,

.wp-pwd [type="text"],
.wp-pwd [type="password"] {
margin: 0;
margin-bottom: 0;
/* Same height as the buttons */
line-height: 20px;
min-height: 28px;
@@ -542,10 +542,6 @@ fieldset label,
display: inline-block;
}

.form-table span.description.important {
font-size: 12px;
}

p.search-box {
float: right;
margin: 0;
@@ -174,8 +174,9 @@ submit {
.form-table input[type=text],
.form-table input[type=email],
.form-table input[type=url],
.form-table input[type=password] {
width: 206px;
.form-table input[type=password],
#pass-strength-result {
width: 218px;
}

.form-table th p {
@@ -212,66 +213,6 @@ submit {
font-family: Consolas, Monaco, monospace;
}

.wp-hide-pw > .dashicons {
line-height: inherit;
}

#pass-strength-result {
background-color: #eee;
border: 1px solid #ddd;
color: #23282d;
margin: -2px 5px 5px 0px;
padding: 3px 5px;
text-align: center;
width: 218px;
box-sizing: border-box;
opacity: 0;
}

#pass-strength-result.short {
background-color: #f1adad;
border-color: #e35b5b;
opacity: 1;
}

#pass-strength-result.bad {
background-color: #fbc5a9;
border-color: #f78b53;
opacity: 1;
}

#pass-strength-result.good {
background-color: #ffe399;
border-color: #ffc733;
opacity: 1;
}

#pass-strength-result.strong {
background-color: #c1e1b9;
border-color: #83c373;
opacity: 1;
}

#pass1.short, #pass1-text.short {
border-color: #e35b5b;
}

#pass1.bad, #pass1-text.bad {
border-color: #f78b53;
}

#pass1.good, #pass1-text.good {
border-color: #ffc733;
}

#pass1.strong, #pass1-text.strong {
border-color: #83c373;
}

.pw-weak {
display: none;
}

.message {
border-left: 4px solid #dc3232;
padding: .7em .6em;
@@ -291,20 +232,6 @@ submit {
direction: ltr;
}

#pass1-text,
.show-password #pass1 {
display: none;
}

.show-password #pass1-text
{
display: inline-block;
}

.form-table span.description.important {
font-size: 12px;
}


/* localization */
body.rtl,
@@ -1,6 +1,3 @@
@import url(forms.css);
@import url(l10n.css);

html,
body {
height: 100%;
@@ -71,10 +71,7 @@ function display_header( $body_classes = '' ) {
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex,nofollow" />
<title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
<?php
wp_admin_css( 'install', true );
wp_admin_css( 'dashicons', true );
?>
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="wp-core-ui<?php echo $body_classes; ?>">
<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>
@@ -142,7 +139,7 @@ function display_setup_form( $error = null ) {
</label>
</th>
<td>
<div class="">
<div class="wp-pwd">
<?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
<button type="button" class="button wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
@@ -18,9 +18,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="noindex,nofollow" />
<title><?php _e( 'WordPress &rsaquo; Database Repair' ); ?></title>
<?php
wp_admin_css( 'install', true );
?>
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="wp-core-ui">
<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>
@@ -1943,7 +1943,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) );
$styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons' ) );
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
$styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
$styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
$styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );

0 comments on commit da1178b

Please sign in to comment.
You can’t perform that action at this time.