Skip to content

chore: Address comments in #3911 #7690

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
tofumatt merged 2 commits into from
Jul 3, 2018
Merged

chore: Address comments in #3911 #7690

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77f8108
chore: Fix unclear comments
tofumatt Jul 3, 2018
fa59f48
chore: Tidy up inline comments
tofumatt Jul 3, 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
27 changes: 17 additions & 10 deletions editor/components/block-list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,15 +369,16 @@
}
}

// The padding collapses, but the outline is still 1px to compensate for.
// Keep a 1px margin to compensate for the border/outline.
.editor-block-contextual-toolbar {
margin-bottom: 1px;
}
}

// Left
&[data-align="left"] {
.editor-block-list__block-edit { // This is in the editor only, on the frontend, the img should be floated
// This is in the editor only; the image should be floated on the frontend.
.editor-block-list__block-edit {
/*!rtl:begin:ignore*/
float: left;
margin-right: 2em;
Expand All @@ -387,7 +388,8 @@

// Right
&[data-align="right"] {
.editor-block-list__block-edit { // This is in the editor only, on the frontend, the img should be floated
// This is in the editor only; the image should be floated on the frontend.
.editor-block-list__block-edit {
/*!rtl:begin:ignore*/
float: right;
margin-left: 2em;
Expand All @@ -411,7 +413,8 @@
// Mover and settings above
> .editor-block-mover,
> .editor-block-settings-menu {
top: -$block-side-ui-width - $border-width; // This moves the menu up by the height of the button + border.
// This moves the menu up by the height of the button + border.
top: -$block-side-ui-width - $border-width;
bottom: auto;
min-height: 0;
height: auto;
Expand Down Expand Up @@ -547,8 +550,9 @@
position: absolute;
top: 0;
width: $block-side-ui-width + $block-side-ui-clearance;
height: 100%; // stretch to fill half of the available space to increase hoverable area
max-height: $block-side-ui-width * 4; // stretch to fill half of the available space to increase hoverable area
// stretch to fill half of the available space to increase hoverable area
height: 100%;
max-height: $block-side-ui-width * 4;
}

// Elevate when selected or hovered
Expand Down Expand Up @@ -614,7 +618,8 @@
.editor-block-list__block-mobile-toolbar {
display: flex;
flex-direction: row;
margin-top: $item-spacing + $block-toolbar-height; // Make room for the height of the block toolbar above.
// Make room for the height of the block toolbar above.
margin-top: $item-spacing + $block-toolbar-height;
margin-right: -$block-padding;
margin-bottom: -$block-padding - $border-width;
margin-left: -$block-padding;
Expand Down Expand Up @@ -684,7 +689,7 @@
*/
.editor-block-list .editor-inserter {
margin: $item-spacing;
cursor: move;/* Fallback for IE/Edge < 14 */
cursor: move; // Fallback for IE/Edge < 14
cursor: grab;
}

Expand Down Expand Up @@ -715,7 +720,8 @@
bottom: auto;
left: 0;
right: 0;
height: $block-padding * 2; // Matches the whole empty space between two blocks
// Matches the whole empty space between two blocks
height: $block-padding * 2;
justify-content: center;

// Show a clickable plus.
Expand Down Expand Up @@ -761,7 +767,8 @@
> .editor-block-list__insertion-point {
position: absolute;
top: -$block-padding - $block-spacing / 2;
height: $block-padding * 2; // Matches the whole empty space between two blocks
// Matches the whole empty space between two blocks
height: $block-padding * 2;
bottom: auto;
left: -$border-width;
right: -$border-width;
Expand Down