Twenty Twenty-One: Fix obsolete navigation block styles for better Global Styles support.

This changeset removes some CSS custom properties that targets navigation menu items to avoid preventing the block from inheriting padding values set by the Global Styles system.

Props Joen, desrosj, poena, audrasjb, hellofromtonya, SergeyBiryukov.
Fixes #53220.


git-svn-id: https://develop.svn.wordpress.org/trunk@55101 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2023-01-19 17:39:10 +00:00
parent e229ac401d
commit a9bd7719db
11 changed files with 19 additions and 107 deletions

View File

@ -1461,13 +1461,13 @@ dt {
border: 3px solid #28303d;
}
.wp-block-navigation .wp-block-navigation__container {
background: #d1e4dd;
padding: 0;
.wp-block-navigation [data-block] {
margin-top: revert;
margin-bottom: revert;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
padding: 13px;
.wp-block-navigation .wp-block-navigation__container {
background: #d1e4dd;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {

File diff suppressed because one or more lines are too long

View File

@ -3538,14 +3538,6 @@ dd {
border: 3px solid #28303d;
}
.wp-block-navigation .wp-block-navigation-link {
padding: 0;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
padding: 13px;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 1.25rem;
@ -3563,7 +3555,6 @@ dd {
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
border: none;
left: 0;
margin-left: 13px;
min-width: max-content;
opacity: 0;
padding: 0;
@ -3571,22 +3562,10 @@ dd {
top: inherit;
}
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
display: inline-block;
padding: 7px 13px;
}
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
display: none;
}
.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
display: block;
opacity: 1;
visibility: visible;
}
.wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
background: #d1e4dd;
margin: 0;

File diff suppressed because one or more lines are too long

View File

@ -1376,13 +1376,13 @@ dt {
border: calc(3 * var(--separator--height)) solid var(--global--color-border);
}
.wp-block-navigation .wp-block-navigation__container {
background: var(--global--color-background);
padding: 0;
.wp-block-navigation [data-block] {
margin-top: revert;
margin-bottom: revert;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
padding: var(--primary-nav--padding);
.wp-block-navigation .wp-block-navigation__container {
background: var(--global--color-background);
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {

File diff suppressed because one or more lines are too long

View File

@ -1,16 +1,16 @@
.wp-block-navigation {
[data-block] {
margin-top: revert;
margin-bottom: revert;
}
.wp-block-navigation__container {
background: var(--global--color-background);
padding: 0;
}
.wp-block-navigation-link {
.wp-block-navigation-link__content {
padding: var(--primary-nav--padding);
}
.wp-block-navigation-link__label {
font-family: var(--primary-nav--font-family);
font-size: var(--primary-nav--font-size);

View File

@ -1,12 +1,6 @@
.wp-block-navigation {
.wp-block-navigation-link {
padding: 0;
.wp-block-navigation-link__content {
padding: var(--primary-nav--padding);
}
.wp-block-navigation-link__label {
font-family: var(--primary-nav--font-family);
font-size: var(--primary-nav--font-size);
@ -30,35 +24,16 @@
.wp-block-navigation__container {
border: none;
left: 0;
margin-left: var(--primary-nav--padding);
min-width: max-content;
opacity: 0;
padding: 0;
position: inherit;
top: inherit;
.wp-block-navigation-link {
.wp-block-navigation-link__content {
display: inline-block;
padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
}
}
.wp-block-navigation-link__submenu-icon {
display: none;
}
}
&:hover,
&:focus-within {
.wp-block-navigation__container {
display: block;
opacity: 1;
visibility: visible;
}
}
}
> .has-child {

View File

@ -2711,14 +2711,6 @@ dd {
border: calc(3 * var(--separator--height)) solid var(--global--color-border);
}
.wp-block-navigation .wp-block-navigation-link {
padding: 0;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
padding: var(--primary-nav--padding);
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
font-family: var(--primary-nav--font-family);
font-size: var(--primary-nav--font-size);
@ -2736,7 +2728,6 @@ dd {
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
border: none;
right: 0;
margin-right: var(--primary-nav--padding);
min-width: max-content;
opacity: 0;
padding: 0;
@ -2744,22 +2735,10 @@ dd {
top: inherit;
}
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
display: inline-block;
padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
}
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
display: none;
}
.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
display: block;
opacity: 1;
visibility: visible;
}
.wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
background: var(--global--color-background);
margin: 0;

View File

@ -2721,14 +2721,6 @@ dd {
border: calc(3 * var(--separator--height)) solid var(--global--color-border);
}
.wp-block-navigation .wp-block-navigation-link {
padding: 0;
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
padding: var(--primary-nav--padding);
}
.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
font-family: var(--primary-nav--font-family);
font-size: var(--primary-nav--font-size);
@ -2746,7 +2738,6 @@ dd {
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
border: none;
left: 0;
margin-left: var(--primary-nav--padding);
min-width: max-content;
opacity: 0;
padding: 0;
@ -2754,22 +2745,10 @@ dd {
top: inherit;
}
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
display: inline-block;
padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
}
.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
display: none;
}
.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
display: block;
opacity: 1;
visibility: visible;
}
.wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
background: var(--global--color-background);
margin: 0;

File diff suppressed because one or more lines are too long