From 922c74ac703c7045627c210e2b744672734ac54f Mon Sep 17 00:00:00 2001 From: Tammie Lister Date: Mon, 13 May 2024 16:43:08 +0000 Subject: [PATCH] Twenty Twenty-One: Fixes primary menu disappearing. The primary menu was disappearing at 481px. This adjusts to resolve this. It was shown when adjust the browser window not in responsive design mode. Props stephenbrook, audrasjb, mukesh27, sabernhardt, poena, kristenfisher427, siliconforks, jwgoedert, joedolson. Fixes #52354. Built from https://develop.svn.wordpress.org/trunk@58142 git-svn-id: http://core.svn.wordpress.org/trunk@57607 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../twentytwentyone/assets/css/ie-editor.css | 4 +- .../themes/twentytwentyone/assets/css/ie.css | 36 ++++++++--------- .../assets/css/style-editor.css | 6 +-- .../assets/sass/03-generic/breakpoints.scss | 10 ++--- .../themes/twentytwentyone/style-rtl.css | 40 +++++++++---------- wp-content/themes/twentytwentyone/style.css | 40 +++++++++---------- wp-includes/version.php | 2 +- 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css index d892ab7c7f..cef8e02a0e 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css @@ -197,7 +197,7 @@ blockquote footer { font-size: 1rem; font-style: normal; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { blockquote { padding-left: 13px; @@ -1577,7 +1577,7 @@ pre.wp-block-preformatted { font-size: 2.5rem; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.is-large, .wp-block-quote.is-style-large { diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css index 1f53bd16d2..eb5145666d 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -1228,7 +1228,7 @@ blockquote footer { font-size: 1rem; font-style: normal; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { blockquote { padding-left: 13px; @@ -2490,7 +2490,7 @@ h6, max-width: 50%; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .entry-content > .wp-block-image > .alignleft, .entry-content > .wp-block-image > .alignright { @@ -3294,7 +3294,7 @@ pre.wp-block-preformatted { color: #28303d; font-size: 1.125rem; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.is-large, .wp-block-quote.is-style-large { @@ -4219,7 +4219,7 @@ table.wp-calendar-table caption { } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .site-header.has-logo:not(.has-title-and-tagline).has-menu .site-logo { position: absolute; @@ -4291,7 +4291,7 @@ table.wp-calendar-table caption { .no-widgets .site-footer { margin-top: 180px; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .no-widgets .site-footer { margin-top: 90px; @@ -4522,7 +4522,7 @@ body:not(.single) .site-main > article:last-of-type .entry-footer { .single .site-main > article > .entry-footer .tags-links { display: block; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .single .site-main > article > .entry-footer, .single .site-main > article > .entry-footer .full-size-link { @@ -4941,7 +4941,7 @@ h1.page-title { flex-basis: 0; flex-grow: 1; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .comment-form .comment-form-author, .comment-form .comment-form-email { @@ -5002,7 +5002,7 @@ h1.page-title { padding-top: 15px; padding-bottom: 8px; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .menu-button-container { display: flex; @@ -5090,7 +5090,7 @@ h1.page-title { transition: all 0.15s ease-in-out; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > .primary-menu-container { height: 100vh; @@ -5142,7 +5142,7 @@ h1.page-title { opacity: 1; transform: translateY(0); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation-open .has-logo.has-title-and-tagline .primary-navigation > .primary-menu-container { transform: translateX(0) translateY(0); @@ -5186,7 +5186,7 @@ h1.page-title { padding-left: 0; position: relative; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > div > .menu-wrapper { padding-bottom: 100px; @@ -5229,7 +5229,7 @@ h1.page-title { .primary-navigation > div > .menu-wrapper .sub-menu-toggle:focus { outline: 2px solid #28303d; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > div > .menu-wrapper .sub-menu-toggle { display: none; @@ -5451,7 +5451,7 @@ h1.page-title { padding: 0; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation .sub-menu .menu-item:last-child { margin-bottom: 0; @@ -5499,7 +5499,7 @@ h1.page-title { display: inline-block; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .lock-scrolling .site { position: fixed; @@ -5796,7 +5796,7 @@ h1.page-title { .comments-pagination .nav-links > *.prev { margin-right: auto; } -@media only screen and (max-width: 821px) { +@media only screen and (max-width: 821.98px) { .pagination .nav-links, .comments-pagination .nav-links { @@ -5817,7 +5817,7 @@ h1.page-title { flex: 0 1 auto; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .pagination .nav-short, .comments-pagination .nav-short { @@ -5861,7 +5861,7 @@ h1.page-title { grid-template-columns: repeat(3, 1fr); } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .widget-area { margin-top: 90px; @@ -6259,7 +6259,7 @@ footer { .is-IE.is-dark-theme .primary-navigation > div > .menu-wrapper > li > .sub-menu li { background: #000; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .is-IE.is-dark-theme.primary-navigation-open .primary-navigation > .primary-menu-container, .is-IE.is-dark-theme.primary-navigation-open .menu-button-container { diff --git a/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/wp-content/themes/twentytwentyone/assets/css/style-editor.css index b2535e111e..2cb3872b26 100644 --- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -381,7 +381,7 @@ blockquote footer { font-size: var(--global--font-size-xs); font-style: var(--quote--font-style-cite); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { blockquote { padding-left: calc(0.5 * var(--global--spacing-horizontal)); @@ -1626,7 +1626,7 @@ pre.wp-block-preformatted { line-height: var(--quote--line-height-large); margin-right: 10px; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.is-large, .wp-block-quote.is-style-large { @@ -1649,7 +1649,7 @@ pre.wp-block-preformatted { right: 0; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote { padding-left: calc(0.5 * var(--global--spacing-horizontal)); diff --git a/wp-content/themes/twentytwentyone/assets/sass/03-generic/breakpoints.scss b/wp-content/themes/twentytwentyone/assets/sass/03-generic/breakpoints.scss index 254c8136f6..6f0ab88759 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/03-generic/breakpoints.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/03-generic/breakpoints.scss @@ -18,7 +18,7 @@ $breakpoint_xxl: 1024px; @mixin media( $res ) { @if mobile-only == $res { - @media only screen and (max-width: #{$breakpoint_sm - 1}) { + @media only screen and (max-width: #{$breakpoint_sm - 0.02}) { @content; } } @@ -30,7 +30,7 @@ $breakpoint_xxl: 1024px; } @if tablet-only == $res { - @media only screen and (max-width: #{$breakpoint_md - 1}) { + @media only screen and (max-width: #{$breakpoint_md - 0.02}) { @content; } } @@ -42,7 +42,7 @@ $breakpoint_xxl: 1024px; } @if laptop-only == $res { - @media only screen and (max-width: #{$breakpoint_lg - 1}) { + @media only screen and (max-width: #{$breakpoint_lg - 0.02}) { @content; } } @@ -54,7 +54,7 @@ $breakpoint_xxl: 1024px; } @if desktop-only == $res { - @media only screen and (max-width: #{$breakpoint_xl - 1}) { + @media only screen and (max-width: #{$breakpoint_xl - 0.02}) { @content; } } @@ -66,7 +66,7 @@ $breakpoint_xxl: 1024px; } @if wide-only == $res { - @media only screen and (max-width: #{$breakpoint_xxl - 1}) { + @media only screen and (max-width: #{$breakpoint_xxl - 0.02}) { @content; } } diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css index f70c4371ad..7c5eb4597f 100644 --- a/wp-content/themes/twentytwentyone/style-rtl.css +++ b/wp-content/themes/twentytwentyone/style-rtl.css @@ -1119,7 +1119,7 @@ blockquote footer { font-size: var(--global--font-size-xs); font-style: var(--quote--font-style-cite); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { blockquote { padding-right: calc(0.5 * var(--global--spacing-horizontal)); @@ -2326,7 +2326,7 @@ h6, max-width: 50%; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .entry-content > .wp-block-image > .alignleft, .entry-content > .wp-block-image > .alignright { @@ -3037,7 +3037,7 @@ pre.wp-block-preformatted { color: var(--global--color-primary); font-size: var(--global--font-size-sm); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.is-large, .wp-block-quote.is-style-large { @@ -3066,7 +3066,7 @@ pre.wp-block-preformatted { padding-left: 0; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.has-text-align-right { padding-right: 0; @@ -3783,7 +3783,7 @@ table.wp-calendar-table caption { } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .site-header.has-logo:not(.has-title-and-tagline).has-menu .site-logo { position: absolute; @@ -3855,7 +3855,7 @@ table.wp-calendar-table caption { .no-widgets .site-footer { margin-top: calc(6 * var(--global--spacing-vertical)); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .no-widgets .site-footer { margin-top: calc(3 * var(--global--spacing-vertical)); @@ -4081,7 +4081,7 @@ body:not(.single) .site-main > article:last-of-type .entry-footer { .single .site-main > article > .entry-footer .tags-links { display: block; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .single .site-main > article > .entry-footer { display: block; @@ -4449,7 +4449,7 @@ h1.page-title { flex-basis: 0; flex-grow: 1; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .comment-form .comment-form-author, .comment-form .comment-form-email { @@ -4510,7 +4510,7 @@ h1.page-title { padding-top: calc(0.5 * var(--global--spacing-vertical)); padding-bottom: calc(0.25 * var(--global--spacing-vertical)); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .menu-button-container { display: flex; @@ -4601,7 +4601,7 @@ h1.page-title { transition: all 0.15s ease-in-out; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > .primary-menu-container { height: 100vh; @@ -4628,7 +4628,7 @@ h1.page-title { border: 2px solid var(--global--color-primary); } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation-open .primary-navigation { width: 100%; @@ -4643,7 +4643,7 @@ h1.page-title { opacity: 1; transform: translateY(0); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation-open .has-logo.has-title-and-tagline .primary-navigation > .primary-menu-container { transform: translateX(0) translateY(0); @@ -4693,7 +4693,7 @@ h1.page-title { padding-right: 0; position: relative; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > div > .menu-wrapper { padding-bottom: 100px; @@ -4736,7 +4736,7 @@ h1.page-title { .primary-navigation > div > .menu-wrapper .sub-menu-toggle:focus { outline: 2px solid var(--wp--style--color--link, var(--global--color-primary)); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > div > .menu-wrapper .sub-menu-toggle { display: none; @@ -4926,7 +4926,7 @@ h1.page-title { padding: 0; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation .sub-menu .menu-item:last-child { margin-bottom: 0; @@ -4974,7 +4974,7 @@ h1.page-title { display: inline-block; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .lock-scrolling .site { position: fixed; @@ -5271,7 +5271,7 @@ h1.page-title { .comments-pagination .nav-links > *.prev { margin-left: auto; } -@media only screen and (max-width: 821px) { +@media only screen and (max-width: 821.98px) { .pagination .nav-links, .comments-pagination .nav-links { @@ -5292,7 +5292,7 @@ h1.page-title { flex: 0 1 auto; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .pagination .nav-short, .comments-pagination .nav-short { @@ -5336,7 +5336,7 @@ h1.page-title { grid-template-columns: repeat(3, 1fr); } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .widget-area { margin-top: calc(3 * var(--global--spacing-vertical)); @@ -5840,7 +5840,7 @@ footer { .is-IE.is-dark-theme .primary-navigation > div > .menu-wrapper > li > .sub-menu li { background: #000; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .is-IE.is-dark-theme.primary-navigation-open .primary-navigation > .primary-menu-container, .is-IE.is-dark-theme.primary-navigation-open .menu-button-container { diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css index 5e92ab4b38..517464a456 100644 --- a/wp-content/themes/twentytwentyone/style.css +++ b/wp-content/themes/twentytwentyone/style.css @@ -1127,7 +1127,7 @@ blockquote footer { font-size: var(--global--font-size-xs); font-style: var(--quote--font-style-cite); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { blockquote { padding-left: calc(0.5 * var(--global--spacing-horizontal)); @@ -2336,7 +2336,7 @@ h6, max-width: 50%; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .entry-content > .wp-block-image > .alignleft, .entry-content > .wp-block-image > .alignright { @@ -3047,7 +3047,7 @@ pre.wp-block-preformatted { color: var(--global--color-primary); font-size: var(--global--font-size-sm); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.is-large, .wp-block-quote.is-style-large { @@ -3076,7 +3076,7 @@ pre.wp-block-preformatted { padding-right: 0; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .wp-block-quote.has-text-align-right { padding-left: 0; @@ -3803,7 +3803,7 @@ table.wp-calendar-table caption { } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .site-header.has-logo:not(.has-title-and-tagline).has-menu .site-logo { position: absolute; @@ -3875,7 +3875,7 @@ table.wp-calendar-table caption { .no-widgets .site-footer { margin-top: calc(6 * var(--global--spacing-vertical)); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .no-widgets .site-footer { margin-top: calc(3 * var(--global--spacing-vertical)); @@ -4101,7 +4101,7 @@ body:not(.single) .site-main > article:last-of-type .entry-footer { .single .site-main > article > .entry-footer .tags-links { display: block; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .single .site-main > article > .entry-footer { display: block; @@ -4469,7 +4469,7 @@ h1.page-title { flex-basis: 0; flex-grow: 1; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .comment-form .comment-form-author, .comment-form .comment-form-email { @@ -4530,7 +4530,7 @@ h1.page-title { padding-top: calc(0.5 * var(--global--spacing-vertical)); padding-bottom: calc(0.25 * var(--global--spacing-vertical)); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .menu-button-container { display: flex; @@ -4621,7 +4621,7 @@ h1.page-title { transition: all 0.15s ease-in-out; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > .primary-menu-container { height: 100vh; @@ -4648,7 +4648,7 @@ h1.page-title { border: 2px solid var(--global--color-primary); } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation-open .primary-navigation { width: 100%; @@ -4663,7 +4663,7 @@ h1.page-title { opacity: 1; transform: translateY(0); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation-open .has-logo.has-title-and-tagline .primary-navigation > .primary-menu-container { transform: translateX(0) translateY(0); @@ -4713,7 +4713,7 @@ h1.page-title { padding-left: 0; position: relative; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > div > .menu-wrapper { padding-bottom: 100px; @@ -4756,7 +4756,7 @@ h1.page-title { .primary-navigation > div > .menu-wrapper .sub-menu-toggle:focus { outline: 2px solid var(--wp--style--color--link, var(--global--color-primary)); } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation > div > .menu-wrapper .sub-menu-toggle { display: none; @@ -4962,7 +4962,7 @@ h1.page-title { padding: 0; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .primary-navigation .sub-menu .menu-item:last-child { margin-bottom: 0; @@ -5010,7 +5010,7 @@ h1.page-title { display: inline-block; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .lock-scrolling .site { position: fixed; @@ -5307,7 +5307,7 @@ h1.page-title { .comments-pagination .nav-links > *.prev { margin-right: auto; } -@media only screen and (max-width: 821px) { +@media only screen and (max-width: 821.98px) { .pagination .nav-links, .comments-pagination .nav-links { @@ -5328,7 +5328,7 @@ h1.page-title { flex: 0 1 auto; } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .pagination .nav-short, .comments-pagination .nav-short { @@ -5372,7 +5372,7 @@ h1.page-title { grid-template-columns: repeat(3, 1fr); } } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .widget-area { margin-top: calc(3 * var(--global--spacing-vertical)); @@ -5876,7 +5876,7 @@ footer { .is-IE.is-dark-theme .primary-navigation > div > .menu-wrapper > li > .sub-menu li { background: #000; } -@media only screen and (max-width: 481px) { +@media only screen and (max-width: 481.98px) { .is-IE.is-dark-theme.primary-navigation-open .primary-navigation > .primary-menu-container, .is-IE.is-dark-theme.primary-navigation-open .menu-button-container { diff --git a/wp-includes/version.php b/wp-includes/version.php index 12a895d24d..7d95dce5fa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.6-alpha-58141'; +$wp_version = '6.6-alpha-58142'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.