diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css index 69b9a82cc83a4..9e8f2fe167ba4 100644 --- a/src/wp-admin/css/login.css +++ b/src/wp-admin/css/login.css @@ -15,7 +15,7 @@ body { } a { - color: #2271b1; + color: var(--wp-admin-theme-color-darker-10); transition-property: border, background, color; transition-duration: .05s; transition-timing-function: ease-in-out; @@ -27,7 +27,7 @@ a { a:hover, a:active { - color: #135e96; + color: var(--wp-admin-theme-color-darker-20); } a:focus { @@ -44,22 +44,32 @@ p { .login .message, .login .notice, .login .success { - border-left: 4px solid #72aee6; - padding: 12px; + border-left: 4px solid #3858e9; + padding: 8px 12px; + margin-top: 0; margin-left: 0; margin-bottom: 20px; - background-color: #fff; - box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + background-color: transparent; word-wrap: break-word; } +.login .message p, +.login .notice p, +.login .success p { + font-size: 13px; + line-height: 1.54; + margin: 0.5em 0; +} + .login .success { - border-left-color: #00a32a; + border-left-color: #4ab866; + background-color: #eff9f1; } /* Match border color from common.css */ .login .notice-error { - border-left-color: #d63638; + border-left-color: #cc1818; + background-color: #fcf0f0; } .login .login-error-list { @@ -113,8 +123,8 @@ p { .login .button.wp-hide-pw:focus { background: transparent; - border-color: #3582c4; - box-shadow: 0 0 0 1px #3582c4; + border-color: var(--wp-admin-theme-color); + box-shadow: 0 0 0 1px var(--wp-admin-theme-color); /* Only visible in Windows High Contrast mode */ outline: 2px solid transparent; } @@ -360,12 +370,6 @@ p { padding-right: 2.5rem; } -.login form .input, -.login input[type="text"], -.login form input[type="checkbox"] { - background: #fff; -} - .js.login-action-resetpass input[type="text"], .js.login-action-resetpass input[type="password"], .js.login-action-rp input[type="text"], diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index f1d6da598e48a..1d45224f5b7e4 100644 --- a/src/wp-admin/includes/media.php +++ b/src/wp-admin/includes/media.php @@ -611,7 +611,7 @@ function wp_iframe( $content_func, ...$args ) { ?> - class="wp-core-ui no-js"> + class="wp-core-ui no-js "> diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index 6b9f178b6dc47..ee3878f4f176f 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -2172,6 +2172,7 @@ function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_r do_action( 'admin_head' ); $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) ); + $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); if ( is_rtl() ) { $admin_body_class .= ' rtl'; diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php index 8083e55fc115c..b655af53f0cb6 100644 --- a/src/wp-admin/install.php +++ b/src/wp-admin/install.php @@ -15,7 +15,7 @@ Error: PHP is not running - +

Error: PHP is not running

WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.

@@ -72,7 +72,7 @@ function display_header( $body_classes = '' ) { <?php _e( 'WordPress › Installation' ); ?> - + - + - + diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 4384c7c10ed2a..1b9a9703ffe40 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -1633,8 +1633,8 @@ 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', 'wp-base-styles' ) ); - $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) ); - $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) ); + $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n', 'wp-base-styles' ) ); + $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n', 'wp-base-styles' ) ); $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', 'imgareaselect' ) ); $styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) ); diff --git a/src/wp-login.php b/src/wp-login.php index c7823a600dd3c..52b4f90673da9 100644 --- a/src/wp-login.php +++ b/src/wp-login.php @@ -166,7 +166,7 @@ function login_header( $title = null, $message = '', $wp_error = null ) { */ $login_header_text = apply_filters( 'login_headertext', $login_header_text ); - $classes = array( 'login-action-' . $action, 'wp-core-ui' ); + $classes = array( 'login-action-' . $action, 'wp-core-ui', 'admin-color-modern' ); if ( is_rtl() ) { $classes[] = 'rtl';