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

Jump to bottom

Normalize spacing in Layout hook controls #65132

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Normalize spacing in Layout hook controls #65132

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
ab12173
Cover block: Normalize spacing in Layout controls
mirka Sep 6, 2024
60d338f
Tweak code comments
mirka Sep 6, 2024
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
22 changes: 6 additions & 16 deletions packages/block-editor/src/hooks/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
.block-editor-hooks__layout-controls-units {
display: flex;
flex-direction: column;
gap: $grid-unit-20;
}

.block-editor-block-inspector .block-editor-hooks__layout-controls-unit-input {
margin-bottom: 0;
}

.block-editor-hooks__layout-controls-reset {
display: flex;
Copy link
Member

Choose a reason for hiding this comment

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

Is there any chance any of these removed classes were used for additional styling?

Copy link
Member Author

Choose a reason for hiding this comment

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

Nope, we're good 👍

justify-content: flex-end;
margin-bottom: $grid-unit-30;
.block-editor-hooks__layout-constrained {
.components-base-control {
margin-bottom: 0; // Cancel out margins added by block inspector
}
}

.block-editor-hooks__layout-controls-helptext {
.block-editor-hooks__layout-constrained-helptext {
color: $gray-700;
Copy link
Member Author

Choose a reason for hiding this comment

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

Renamed the class for consistency with the JS file name. (Naming it controls seems too broad to avoid collisions.)

font-size: $helptext-font-size;
margin-bottom: $grid-unit-20;
margin-bottom: 0; // Cancel out margins added by common.css
}

.block-editor-hooks__flex-layout-justification-controls,
Expand Down
16 changes: 9 additions & 7 deletions packages/block-editor/src/layouts/constrained.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
__experimentalToggleGroupControl as ToggleGroupControl,
__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,
__experimentalVStack as VStack,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import {
Expand Down Expand Up @@ -70,12 +71,14 @@ export default {
availableUnits: availableUnits || [ '%', 'px', 'em', 'rem', 'vw' ],
} );
return (
<>
<VStack
spacing={ 4 }
className="block-editor-hooks__layout-constrained"
>
{ allowCustomContentAndWideSize && (
<div className="block-editor-hooks__layout-controls-units">
<>
<UnitControl
__next40pxDefaultSize
className="block-editor-hooks__layout-controls-unit-input"
label={ __( 'Content width' ) }
labelPosition="top"
value={ contentSize || wideSize || '' }
Expand All @@ -98,7 +101,6 @@ export default {
/>
<UnitControl
__next40pxDefaultSize
className="block-editor-hooks__layout-controls-unit-input"
label={ __( 'Wide width' ) }
labelPosition="top"
value={ wideSize || contentSize || '' }
Expand All @@ -119,12 +121,12 @@ export default {
</InputControlPrefixWrapper>
}
/>
<p className="block-editor-hooks__layout-controls-helptext">
<p className="block-editor-hooks__layout-constrained-helptext">
{ __(
'Customize the width for all elements that are assigned to the center or wide columns.'
) }
</p>
</div>
</>
) }
{ allowJustification && (
Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think any Core blocks show this Justification control, but I made sure that the spacing looks correct even with the Justification control showing. (It is correct in trunk, and still correct here)

With Justification control

<ToggleGroupControl
Expand All @@ -148,7 +150,7 @@ export default {
) }
</ToggleGroupControl>
) }
</>
</VStack>
);
},
toolBarControls: function DefaultLayoutToolbarControls( {
Expand Down
Loading