Skip to content

Fix switcher focus style. #33031

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

Merged
jasmussen merged 2 commits into from
Jun 28, 2021
Merged

Fix switcher focus style. #33031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f9e168
Fix switcher focus style.
jasmussen Jun 28, 2021
8ea29cb
Polish RBs.
jasmussen Jun 28, 2021
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
8 changes: 0 additions & 8 deletions packages/block-editor/src/components/block-toolbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@
width: $button-size-small !important;
margin: 0 !important;
}

&:focus::before {
right: $grid-unit-05 !important;
}
}

// Match the parent selector button.
Expand Down Expand Up @@ -158,10 +154,6 @@
width: 0 !important;
height: 0 !important;
}

&:focus::before {
right: $grid-unit-05 !important;
}
}

// Parent selector overrides
Expand Down
8 changes: 4 additions & 4 deletions packages/components/src/toolbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
}

// Ensure the icon buttons remain square.
&.has-icon {
// This needs specificity.
&.has-icon.has-icon {
Copy link
Member

@mtias mtias Jun 28, 2021

Choose a reason for hiding this comment

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

What's the double class for?

Copy link
Contributor Author

@jasmussen jasmussen Jun 28, 2021

Choose a reason for hiding this comment

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

Short answer: it incrementally increases the specificity of this rule.

Longer answer, it adds specificity to override this inherited padding:

Screenshot 2021-06-28 at 14 29 56

This wasn't necessary in the past, since the icon was centered inside the 48x48 button. But once you add text, such as in reusable blocks, that lower padding will be leveraged. By setting higher specificity and bigger padding, we get it right:

Screenshot 2021-06-28 at 14 30 46

Much longer answer: the block toolbar works decently as is. But having grown organically from features across the years, the CSS is at a level of complexity where it'd be nice to revisit it in a refactor.

// Reduce the default padding when a button only has an icon.
padding-left: $grid-unit-10;
padding-right: $grid-unit-10;
padding-left: $grid-unit-15;
padding-right: $grid-unit-15;
min-width: $block-toolbar-height;
justify-content: center;
}

// @todo: We should extract the tabs styles to the tabs component itself
Expand Down