Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/wp-admin/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body {
}

a {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These will need validation that there aren't any side-effects. The color of the back to site and lost password links in the footer of the screen are coded with a higher specificity so I think they will be fine.

color: #2271b1;
color: var(--wp-admin-theme-color-darker-10);
transition-property: border, background, color;
transition-duration: .05s;
transition-timing-function: ease-in-out;
Expand All @@ -27,7 +27,7 @@ a {

a:hover,
a:active {
color: #135e96;
color: var(--wp-admin-theme-color-darker-20);
}

a:focus {
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/media.php
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ function wp_iframe( $content_func, ...$args ) {

?>
</head>
<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js <?php echo 'admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); ?>">
<script>
document.body.className = document.body.className.replace('no-js', 'js');
</script>
Expand Down
1 change: 1 addition & 0 deletions src/wp-admin/includes/template.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Error: PHP is not running</title>
</head>
<body class="wp-core-ui">
<body class="wp-core-ui admin-color-modern">
<h1>Error: PHP is not running</h1>
<p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
</body>
Expand Down Expand Up @@ -72,7 +72,7 @@ function display_header( $body_classes = '' ) {
<title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="wp-core-ui<?php echo $body_classes; ?>">
<body class="wp-core-ui admin-color-modern<?php echo $body_classes; ?>">
<p id="logo"><?php _e( 'WordPress' ); ?></p>

<?php
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/maint/repair.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<title><?php _e( 'WordPress &rsaquo; Database Repair' ); ?></title>
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="wp-core-ui">
<body class="wp-core-ui admin-color-modern">
<p id="logo"><?php _e( 'WordPress' ); ?></p>

<?php
Expand Down
1 change: 1 addition & 0 deletions src/wp-admin/setup-config.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
function setup_config_display_header( $body_classes = array() ) {
$body_classes = (array) $body_classes;
$body_classes[] = 'wp-core-ui';
$body_classes[] = 'admin-color-modern';
$dir_attr = '';
if ( is_rtl() ) {
$body_classes[] = 'rtl';
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<title><?php _e( 'WordPress &rsaquo; Update' ); ?></title>
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="wp-core-ui">
<body class="wp-core-ui admin-color-modern">
<p id="logo"><?php _e( 'WordPress' ); ?></p>

<?php if ( (int) get_option( 'db_version' ) === $wp_db_version || ! is_blog_installed() ) : ?>
Expand Down
4 changes: 2 additions & 2 deletions src/wp-includes/script-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' ) );
Expand Down
2 changes: 1 addition & 1 deletion src/wp-login.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading