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
7 changes: 3 additions & 4 deletions src/wp-admin/admin-footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
global $hook_suffix;
?>

<div class="clear"></div></div><!-- wpbody-content -->
<div class="clear"></div></div><!-- wpbody -->
<div class="clear"></div></div><!-- wpcontent -->

<div id="wpfooter" role="contentinfo">
<?php
/**
Expand Down Expand Up @@ -67,6 +63,9 @@
</p>
<div class="clear"></div>
</div>
<div class="clear"></div></div><!-- wpbody-content -->
<div class="clear"></div></div><!-- wpbody -->
<div class="clear"></div></div><!-- wpcontent -->
<?php
/**
* Prints scripts or data before the default footer scripts.
Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/css/admin-menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ ul#adminmenu > li.current > a.current:after {
width: 0;
position: absolute;
pointer-events: none;
border-right-color: #f0f0f1;
border-right-color: #fff;
top: 50%;
margin-top: -8px;
}
Expand Down Expand Up @@ -663,7 +663,7 @@ li#wp-admin-bar-menu-toggle {
.auto-fold #wpcontent {
position: relative;
margin-left: 0;
padding-left: 10px;
padding-left: 0;
}

.sticky-menu #adminmenuwrap {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/css/colors/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $notification-color: #d54e21 !default;

// global

$body-background: $gray-100 !default;
$body-background: $white !default;

$link: #0073aa !default;
$link-focus: color.adjust($link, $lightness: 10%) !default;
Expand Down
108 changes: 84 additions & 24 deletions src/wp-admin/css/common.css
Original file line number Diff line number Diff line change
@@ -1,32 +1,72 @@
/* 2 column liquid layout */
#wpwrap {
height: auto;
min-height: 100%;
height: calc(100vh - var(--wp-admin--admin-bar--height, 32px));
width: 100%;
position: relative;
-webkit-font-smoothing: subpixel-antialiased;
background: #1e1e1e;
overflow: hidden;
}

#wpcontent {
height: 100%;
padding-left: 20px;
padding: 0 8px 8px 0;
display: flex;
flex-direction: column;
box-sizing: border-box;
}

#wpcontent,
#wpfooter {
#wpcontent {
margin-left: 160px;
}

.folded #wpcontent,
.folded #wpfooter {
.folded #wpcontent {
margin-left: 36px;
}

#wpbody {
flex: 1;
min-height: 0;
}

#wpbody-content {
padding-bottom: 65px;
float: left;
width: 100%;
overflow: visible;
position: relative;
height: 100%;
box-sizing: border-box;
display: flex;
flex-direction: column;
overflow-y: auto;
overscroll-behavior: none;
background: #fff;
border-radius: 8px;
}

/* Block editor frame overrides */
body.js.block-editor-page #wpbody-content {
padding-bottom: 0;
overflow: hidden;
}

body.js.block-editor-page:not(.is-fullscreen-mode) .interface-interface-skeleton {
right: 8px;
bottom: 8px;
border-radius: 8px;
overflow: hidden;
}

/* Fullscreen mode: remove frame */
body.is-fullscreen-mode #wpwrap {
height: 100vh;
background: #fff;
}

body.is-fullscreen-mode #wpcontent {
padding: 0;
margin-left: 0;
}

body.is-fullscreen-mode #wpbody-content {
border-radius: 0;
}

/* inner 2 column liquid layout */
Expand Down Expand Up @@ -222,7 +262,7 @@ body {
}

body {
background: #f0f0f1;
background: #fff;
color: #3c434a;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 13px;
Expand Down Expand Up @@ -584,7 +624,9 @@ code {
}

.wrap {
margin: 10px 20px 0 2px;
margin: 0;
padding: 10px 20px 0 20px;
margin-top: -32px;
Comment on lines +627 to +629
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
margin: 0;
padding: 10px 20px 0 20px;
margin-top: -32px;
margin: -32px 0 0;
padding: 10px 20px 0 20px;

}

.wrap > h2:first-child, /* Back-compat for pre-4.4 */
Expand Down Expand Up @@ -1846,14 +1888,14 @@ p.auto-update-status {
}

#screen-meta-links {
float: right;
align-self: flex-end;
Copy link
Contributor

Choose a reason for hiding this comment

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

This change causes the 'Enable Accessibility Mode' link for turning on the widget accessibility mode to fall behind the Help toggle. When they were both floated, they respected each other's boundaries; but with this, they don't.

margin: 0 20px 0 0;
}

/* screen options and help tabs revert */
#screen-meta {
display: none;
margin: 0 20px -1px 0;
margin: 0 20px -1px 20px;
position: relative;
background-color: #fff;
border: 1px solid #c3c4c7;
Expand Down Expand Up @@ -2353,12 +2395,10 @@ html.wp-toolbar {
------------------------------------------------------------------------------*/

#wpfooter {
position: absolute;
bottom: 0;
left: 0;
right: 0;
padding: 10px 20px;
color: #50575e;
margin-top: auto;
padding-top: 24px;
}

#wpfooter p {
Expand Down Expand Up @@ -2417,8 +2457,8 @@ h3 .nav-tab, /* Back-compat for pre-4.4 */
.nav-tab-active:hover,
.nav-tab-active:focus,
.nav-tab-active:focus:active {
border-bottom: 1px solid #f0f0f1;
background: #f0f0f1;
border-bottom: 1px solid #fff;
background: #fff;
color: #000;
}

Expand Down Expand Up @@ -3991,20 +4031,38 @@ img {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
}

#wpwrap {
height: auto;
overflow: visible;
background: none;
}

#wpcontent {
position: relative;
margin-left: 0;
padding-left: 10px;
padding: 0;
height: auto;
display: block;
}

#wpbody {
min-height: 0;
}

#wpbody-content {
padding-bottom: 100px;
border-radius: 0;
height: auto;
overflow: visible;
display: block;
background: none;
overscroll-behavior: auto;
}

.wrap {
clear: both;
margin-right: 12px;
margin-left: 0;
margin: 0;
padding: 10px 12px 0;
}

/* categories */
Expand Down Expand Up @@ -4272,9 +4330,11 @@ img {
#screen-meta,
#screen-meta-links {
margin-right: 10px;
margin-left: 10px;
}

#screen-meta-links {
float: right;
margin-bottom: 20px; /* Add margins beneath links for better spacing between boxes and elements */
}

Expand Down
1 change: 1 addition & 0 deletions src/wp-admin/css/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
outline-offset: -2px;
border-radius: 8px;
height: 250px;
margin: 4px;
}

/* Only highlight drop zones when dragging. */
Expand Down
1 change: 0 additions & 1 deletion src/wp-admin/css/edit.css
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@ form#tags-filter {
/* End TinyMCE native fullscreen mode override */

#wp-content-editor-tools {
background-color: #f0f0f1;
padding-top: 20px;
}

Expand Down
Loading