Skip to content

Remove template locking from the columns block #20465

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
youknowriad merged 1 commit into from
Feb 27, 2020
Merged

Remove template locking from the columns block #20465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/block-library/src/columns/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ function ColumnsEditContainer( {
<TextColor>
<div className={ classes } ref={ ref }>
<InnerBlocks
templateLock="all"
allowedBlocks={ ALLOWED_BLOCKS }
__experimentalMoverDirection="horizontal"
/>
</div>
</TextColor>
Expand Down
7 changes: 0 additions & 7 deletions packages/block-library/src/columns/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
}
}

// Ideally all block toolbars should be positioned the same.
.components-popover.block-editor-block-list__block-popover
.components-popover__content
.block-editor-block-contextual-toolbar[data-type="core/column"] {
margin-left: 0;
}

Comment on lines -12 to -18
Copy link
Copy Markdown
Member

@aduth aduth Feb 26, 2020

Choose a reason for hiding this comment

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

What was the purpose of these styles?

Copy link
Copy Markdown
Contributor Author

@youknowriad youknowriad Feb 26, 2020

Choose a reason for hiding this comment

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

I don't know @jasmussen maybe, It was definitely breaking the column block toolbar position though.

Copy link
Copy Markdown
Contributor

@jasmussen jasmussen Feb 27, 2020

Choose a reason for hiding this comment

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

These styles were almost certainly necessary due to the complex left/right margins that innerblock containers used to be born with.

But it's easy to test, if the toolbar is positioned correctly according to the block selected, then these styles are not needed anymore. And good riddance!

.wp-block-columns {
display: block;

Expand Down