Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Navigation: Try to keep :where just for paddings #42967

Merged
merged 4 commits into from
Aug 9, 2022
Merged

Navigation: Try to keep :where just for paddings #42967

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce25cfe
Remove :where for menu show/hiding
jasmussen Aug 4, 2022
64a6e0b
Try to keep :where, but fix the trunk bug.
jasmussen Aug 4, 2022
0beedca
Typo
jasmussen Aug 4, 2022
a2ee094
Fix for submenus.
jasmussen Aug 4, 2022
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
30 changes: 8 additions & 22 deletions packages/block-library/src/navigation/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ $navigation-icon-size: 24px;
// but still allow them to be overridden by user-set colors.
.wp-block-navigation-item__content {
display: block;

// Set the default menu item padding to zero, to allow text-only buttons.
padding: 0;
}

// The following rules provide class based application of user selected text
Expand Down Expand Up @@ -154,10 +151,7 @@ $navigation-icon-size: 24px;
// Styles for submenu flyout.
// These are separated out with reduced specificity to allow better inheritance from Global Styles.
.wp-block-navigation .has-child {
// We use :where to keep specificity minimal, yet still scope it to only the navigation block.
// That way if padding is set in theme.json, it still wins.
// https://css-tricks.com/almanac/selectors/w/where/
:where(.wp-block-navigation__submenu-container) {
.wp-block-navigation__submenu-container {
background-color: inherit;
color: inherit;
position: absolute;
Expand Down Expand Up @@ -233,7 +227,7 @@ $navigation-icon-size: 24px;

// Custom menu items.
// Show submenus on hover unless they open on click.
&:where(:not(.open-on-click)):hover > .wp-block-navigation__submenu-container {
&:not(.open-on-click):hover > .wp-block-navigation__submenu-container {
visibility: visible;
overflow: visible;
opacity: 1;
Expand All @@ -243,7 +237,7 @@ $navigation-icon-size: 24px;
}

// Keep submenus open when focus is within.
&:where(:not(.open-on-click):not(.open-on-hover-click)):focus-within > .wp-block-navigation__submenu-container {
&:not(.open-on-click):not(.open-on-hover-click):focus-within > .wp-block-navigation__submenu-container {
visibility: visible;
overflow: visible;
opacity: 1;
Expand Down Expand Up @@ -339,17 +333,6 @@ button.wp-block-navigation-item__content {
gap: inherit;
}

// Menu items with background.
// We use :where to keep specificity minimal, yet still scope it to only the navigation block.
// That way if padding is set in theme.json, it still wins.
// https://css-tricks.com/almanac/selectors/w/where/
.wp-block-navigation:where(.has-background) {
&,
.wp-block-navigation .wp-block-page-list,
.wp-block-navigation__container {
gap: inherit;
}
}

/**
* Paddings
Expand All @@ -361,15 +344,18 @@ button.wp-block-navigation-item__content {

// When the menu has a background, items have paddings, reduce margins to compensate.
// Treat margins and paddings differently when the block has a background.
.wp-block-navigation:where(.has-background) .wp-block-navigation-item__content {
:where(.wp-block-navigation.has-background .wp-block-navigation-link a:not(.wp-element-button)),
:where(.wp-block-navigation.has-background .wp-block-navigation-submenu a:not(.wp-element-button)) {
padding: 0.5em 1em;
}

// Provide a default padding for submenus who should always have some, regardless of the top level menu items.
.wp-block-navigation :where(.wp-block-navigation__submenu-container) .wp-block-navigation-item__content {
:where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-link a:not(.wp-element-button)),
:where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-submenu a:not(.wp-element-button)) {
padding: 0.5em 1em;
}


/**
* Justifications.
*/
Expand Down