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

Try compensating nested blocks for block padding #6408

Merged
merged 3 commits into from
Jun 11, 2018
Merged

Try compensating nested blocks for block padding #6408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1be4f5c
Try compensating nested blocks for block padding
jasmussen Apr 25, 2018
55fca88
Fix regression in columns.
Apr 30, 2018
d08b459
Remove Quote specific styles.
jasmussen Jun 4, 2018
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
13 changes: 3 additions & 10 deletions core-blocks/columns/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// This is sort of an experiment at making sure the editor looks as much like the end result as possible
// Potentially the rules here can apply to all nested blocks and enable stacking, in which case it should be moved elsewhere
.wp-block-columns .editor-block-list__layout {
margin-left: 0;
margin-right: 0;

&:first-child {
margin-left: -$block-padding;
}
Expand All @@ -15,16 +18,6 @@
}
}

// Wide: show no left/right margin on wide, so they stack with the column side UI
.editor-block-list__block[data-align="wide"] .wp-block-columns .editor-block-list__layout {
&:first-child {
margin-left: 0;
}
&:last-child {
margin-right: 0;
}
}

// Fullwide: show margin left/right to ensure there's room for the side UI
// This is not a 1:1 preview with the front-end where these margins would presumably be zero
// @todo this could be revisited, by for example showing this margin only when the parent block was selected first
Expand Down
11 changes: 10 additions & 1 deletion editor/components/block-list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,19 @@
padding-right: $block-side-ui-padding;
}

// Don't add side padding for nested blocks, @todo see if this can be scoped better
// Don't add side padding for nested blocks, and compensate for block padding
.editor-block-list__block & {
// compensate for side UI
padding-left: 0;
padding-right: 0;

// compensate for block padding horizontally
margin-left: -$block-padding;
margin-right: -$block-padding;

// compensate for block padding and collapsing margins vertically
margin-top: -$block-padding + 1px;
margin-top: -$block-padding + 1px;
}
}

Expand Down