diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css index 24be8ac58c5be..a108c11503e64 100644 --- a/src/wp-admin/css/themes.css +++ b/src/wp-admin/css/themes.css @@ -423,7 +423,7 @@ body.js .theme-browser.search-loading { background: #f0f0f1; background: rgba(240, 240, 241, 0.9); z-index: 10000; /* Over WP Pointers. */ - min-height: calc(100vh - var(--wp-admin--admin-bar--height, 32px)); + min-height: calc(100vh - var(--wp-admin--admin-bar--height, 48px)); } .theme-overlay .theme-header { diff --git a/src/wp-content/themes/twentytwenty/style-rtl.css b/src/wp-content/themes/twentytwenty/style-rtl.css index 671b9ca52a219..e2f1e927b81ce 100644 --- a/src/wp-content/themes/twentytwenty/style-rtl.css +++ b/src/wp-content/themes/twentytwenty/style-rtl.css @@ -965,13 +965,13 @@ th { } .admin-bar .screen-height { - min-height: calc(100vh - 32px); + min-height: calc(100vh - 48px); } @media (max-width: 782px) { .admin-bar .screen-height { - min-height: calc(100vh - 46px); + min-height: calc(100vh - 48px); } } @@ -1461,13 +1461,13 @@ body:not(.enable-search-modal) .site-logo img { } .admin-bar.overlay-header #site-header { - top: 32px; + top: 48px; } @media (max-width: 782px) { .admin-bar.overlay-header #site-header { - top: 46px; + top: 48px; } } @@ -1817,13 +1817,13 @@ body.touch-enabled .primary-menu ul li.menu-item-has-children > a { } .admin-bar .menu-modal { - top: 32px; + top: 48px; } @media (max-width: 782px) { .admin-bar .menu-modal { - top: 46px; + top: 48px; } } @@ -2091,13 +2091,13 @@ button.sub-menu-toggle.active svg { } .admin-bar .search-modal.active { - top: 32px; + top: 48px; } @media (max-width: 782px) { .admin-bar .search-modal.active { - top: 46px; + top: 48px; } } diff --git a/src/wp-content/themes/twentytwenty/style.css b/src/wp-content/themes/twentytwenty/style.css index 174bd0056c025..a97136fae66c7 100644 --- a/src/wp-content/themes/twentytwenty/style.css +++ b/src/wp-content/themes/twentytwenty/style.css @@ -971,13 +971,13 @@ th { } .admin-bar .screen-height { - min-height: calc(100vh - 32px); + min-height: calc(100vh - 48px); } @media (max-width: 782px) { .admin-bar .screen-height { - min-height: calc(100vh - 46px); + min-height: calc(100vh - 48px); } } @@ -1467,13 +1467,13 @@ body:not(.enable-search-modal) .site-logo img { } .admin-bar.overlay-header #site-header { - top: 32px; + top: 48px; } @media (max-width: 782px) { .admin-bar.overlay-header #site-header { - top: 46px; + top: 48px; } } @@ -1825,13 +1825,13 @@ body.touch-enabled .primary-menu ul li.menu-item-has-children > a { } .admin-bar .menu-modal { - top: 32px; + top: 48px; } @media (max-width: 782px) { .admin-bar .menu-modal { - top: 46px; + top: 48px; } } @@ -2099,13 +2099,13 @@ button.sub-menu-toggle.active svg { } .admin-bar .search-modal.active { - top: 32px; + top: 48px; } @media (max-width: 782px) { .admin-bar .search-modal.active { - top: 46px; + top: 48px; } } diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css index df21ab67bbf29..5e782fa70d544 100644 --- a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -219,12 +219,12 @@ } .admin-bar { - --global--admin-bar--height: 32px; + --global--admin-bar--height: 48px; } @media only screen and (max-width: 782px) { .admin-bar { - --global--admin-bar--height: 46px; + --global--admin-bar--height: 48px; } } diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss index 0e5aa0af49583..7a5fb1c266c17 100644 --- a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss +++ b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/global.scss @@ -230,10 +230,10 @@ $baseline-unit: 10px; } .admin-bar { - --global--admin-bar--height: 32px; + --global--admin-bar--height: 48px; @media only screen and (max-width: 782px) { - --global--admin-bar--height: 46px; + --global--admin-bar--height: 48px; } } diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php index 6644e7d02eeab..8880a1765d9a0 100644 --- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php +++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php @@ -348,7 +348,7 @@ public function the_html( $attrs = array() ) { } @media only screen and (max-width: 782px) { #dark-mode-toggler { - margin-top: 32px; + margin-top: 48px; } } diff --git a/src/wp-content/themes/twentytwentyone/style-rtl.css b/src/wp-content/themes/twentytwentyone/style-rtl.css index 1dcbb2abb8ea9..fb93c37cb6e9d 100644 --- a/src/wp-content/themes/twentytwentyone/style-rtl.css +++ b/src/wp-content/themes/twentytwentyone/style-rtl.css @@ -311,12 +311,12 @@ Twenty Twenty-One is distributed under the terms of the GNU GPL. } .admin-bar { - --global--admin-bar--height: 32px; + --global--admin-bar--height: 48px; } @media only screen and (max-width: 782px) { .admin-bar { - --global--admin-bar--height: 46px; + --global--admin-bar--height: 48px; } } diff --git a/src/wp-content/themes/twentytwentyone/style.css b/src/wp-content/themes/twentytwentyone/style.css index 15761c89505c5..03a84eeb91fa3 100644 --- a/src/wp-content/themes/twentytwentyone/style.css +++ b/src/wp-content/themes/twentytwentyone/style.css @@ -311,12 +311,12 @@ Twenty Twenty-One is distributed under the terms of the GNU GPL. } .admin-bar { - --global--admin-bar--height: 32px; + --global--admin-bar--height: 48px; } @media only screen and (max-width: 782px) { .admin-bar { - --global--admin-bar--height: 46px; + --global--admin-bar--height: 48px; } } diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php index 5ba568792209c..f3ee18724192e 100644 --- a/src/wp-includes/admin-bar.php +++ b/src/wp-includes/admin-bar.php @@ -1390,8 +1390,7 @@ function wp_enqueue_admin_bar_bump_styles() { remove_action( 'wp_head', $header_callback ); $css = ' - @media screen { html { margin-top: 32px !important; } } - @media screen and ( max-width: 782px ) { html { margin-top: 46px !important; } } + @media screen { html { margin-top: 48px !important; } } '; wp_add_inline_style( 'admin-bar', $css ); } diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css index 77e196525657a..4648d56c7ff1a 100644 --- a/src/wp-includes/css/admin-bar.css +++ b/src/wp-includes/css/admin-bar.css @@ -1,5 +1,5 @@ html { - --wp-admin--admin-bar--height: 32px; + --wp-admin--admin-bar--height: 48px; scroll-padding-top: var(--wp-admin--admin-bar--height); } @@ -16,7 +16,7 @@ html { font-weight: 400; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-style: normal; - line-height: 2.46153846; + line-height: 3.69230769; /* 48px */ border-radius: 0; box-sizing: content-box; transition: none; @@ -89,8 +89,8 @@ html:lang(he-il) .rtl #wpadminbar * { font-size: 13px; font-weight: 400; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - line-height: 2.46153846; - height: 32px; + line-height: 3.69230769; /* 48px */ + height: 48px; position: fixed; top: 0; left: 0; @@ -134,7 +134,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar .quicklinks a, #wpadminbar .quicklinks .ab-empty-item, #wpadminbar .shortlink-input { - height: 32px; + height: 48px; display: block; padding: 0 10px; margin: 0; @@ -205,7 +205,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar .menupop li:hover > .ab-sub-wrapper, #wpadminbar .menupop li.hover > .ab-sub-wrapper { margin-left: 100%; - margin-top: -32px; + margin-top: -48px; } #wpadminbar .ab-top-secondary .menupop li:hover > .ab-sub-wrapper, @@ -236,7 +236,7 @@ html:lang(he-il) .rtl #wpadminbar * { position: relative; float: left; font: normal 20px/1 dashicons; - padding: 4px 0; + padding: 14px 0; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; background-image: none !important; @@ -259,7 +259,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar .ab-label { display: inline-block; - height: 32px; + height: 48px; } #wpadminbar .ab-submenu .ab-item { @@ -501,7 +501,7 @@ html:lang(he-il) .rtl #wpadminbar * { width: 15px; height: 20px; margin-right: 0; - padding: 6px 0 5px; + padding: 14px 0; } #wpadminbar #wp-admin-bar-wp-logo > .ab-item { @@ -658,14 +658,14 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar #adminbarsearch { position: relative; - height: 32px; + height: 48px; padding: 0 2px; z-index: 1; } #wpadminbar #adminbarsearch:before { position: absolute; - top: 6px; + top: 14px; left: 5px; z-index: 20; font: normal 20px/1 dashicons !important; @@ -722,7 +722,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar #wp-admin-bar-command-palette .ab-icon:before { content: "\f179"; content: "\f179" / ''; - top: 3px; + top: 2px; } #wpadminbar #wp-admin-bar-command-palette kbd { @@ -783,13 +783,14 @@ html:lang(he-il) .rtl #wpadminbar * { } @media screen and (max-width: 782px) { + /* Height stays 48px (same as desktop). Touchification only. */ html { - --wp-admin--admin-bar--height: 46px; + --wp-admin--admin-bar--height: 48px; } /* Toolbar Touchification*/ html #wpadminbar { - height: 46px; + height: 48px; min-width: 240px; /* match the min-width of the body in wp-admin/css/common.css */ } @@ -803,8 +804,8 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar .quicklinks > ul > li > a, #wpadminbar .quicklinks .ab-empty-item { padding: 0; - height: 46px; - line-height: 3.28571428; + height: 48px; + line-height: 3.42857143; /* 48px */ width: auto; } @@ -813,7 +814,7 @@ html:lang(he-il) .rtl #wpadminbar * { margin: 0; padding: 0; width: 52px; - height: 46px; + height: 48px; text-align: center; } @@ -855,7 +856,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar .menupop li:hover > .ab-sub-wrapper, #wpadminbar .menupop li.hover > .ab-sub-wrapper { - margin-top: -46px; + margin-top: -48px; } #wpadminbar .ab-top-menu .menupop .ab-sub-wrapper .menupop > .ab-item { @@ -884,7 +885,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon { padding: 0; width: 52px; - height: 46px; + height: 48px; text-align: center; vertical-align: top; } @@ -932,7 +933,7 @@ html:lang(he-il) .rtl #wpadminbar * { display: block; text-indent: 0; font: normal 32px/1 dashicons; - top: 7px; + top: 8px; width: 52px; text-align: center; -webkit-font-smoothing: antialiased; @@ -941,7 +942,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar #wp-admin-bar-site-name > .ab-item .site-icon { position: absolute; - top: 9px; + top: 10px; left: 12px; width: 28px; height: 28px; @@ -965,8 +966,8 @@ html:lang(he-il) .rtl #wpadminbar * { /* New Content */ #wpadminbar #wp-admin-bar-new-content .ab-icon:before { top: 0; - line-height: 1.26; - height: 46px !important; + line-height: 1.5; + height: 48px !important; text-align: center; width: 52px; display: block; @@ -991,8 +992,8 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar #wp-admin-bar-command-palette .ab-icon:before { display: block; font-size: 34px; - height: 46px; - line-height: 1.38235294; + height: 48px; + line-height: 1.41176471; top: 0; } @@ -1008,7 +1009,7 @@ html:lang(he-il) .rtl #wpadminbar * { #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { position: absolute; - top: 12px; + top: 10px; right: 10px; width: 28px; height: 28px; diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php index 3b78d1610fdad..4acde9fff37ca 100644 --- a/src/wp-includes/deprecated.php +++ b/src/wp-includes/deprecated.php @@ -5961,10 +5961,7 @@ function _admin_bar_bump_cb() { _deprecated_function( __FUNCTION__, '6.4.0', 'wp_enqueue_admin_bar_bump_styles' ); ?>