Skip to content

Commit

Permalink
avoid using -unit directly
Browse files Browse the repository at this point in the history
  • Loading branch information
youknowriad committed Feb 28, 2020
1 parent 5f008ec commit 30c78f7
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.block-editor-color-gradient-control {
&__color-indicator {
margin-bottom: $grid-unit;
margin-bottom: $grid-unit-10;
}

&__button-tabs {
display: block;
margin-bottom: $grid-unit;
margin-bottom: $grid-unit-10;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ $block-editor-link-control-number-of-actions: 1;
* equivalent of the vertical padding.
*/
top: $grid-unit-20 + 1px + ( ( 40px - $button-size ) / 2 );
right: $grid-unit-20 + 1px + min($grid-unit, ( 40px - $button-size ) / 2);
right: $grid-unit-20 + 1px + min($grid-unit-10, ( 40px - $button-size ) / 2);
}

.block-editor-link-control__search-results-wrapper {
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/rich-text/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ figcaption.block-editor-rich-text__editable [data-rich-text-placeholder]::before
.components-popover__content {
width: auto;
min-width: auto;
margin-bottom: $grid-unit;
margin-bottom: $grid-unit-10;
box-shadow: none;

// Block UI appearance.
Expand Down
6 changes: 3 additions & 3 deletions packages/block-library/src/navigation-link/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
}

.block-list-appender {
margin: $grid-unit * 2;
margin-left: $grid-unit * 1.25;
margin-top: $grid-unit * 1.25;
margin: $grid-unit-10 * 2;
margin-left: $grid-unit-10 * 1.25;
margin-top: $grid-unit-10 * 1.25;
}
}

Expand Down
16 changes: 8 additions & 8 deletions packages/block-library/src/navigation/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$navigation-menu-height: $grid-unit * 7;
$navigation-sub-menu-height: $grid-unit * 5;
$navigation-sub-menu-width: $grid-unit * 25;
$navigation-menu-height: $grid-unit-10 * 7;
$navigation-sub-menu-height: $grid-unit-10 * 5;
$navigation-sub-menu-width: $grid-unit-10 * 25;

/*
* Frontend: reset the default list styles
Expand Down Expand Up @@ -158,30 +158,30 @@ $navigation-sub-menu-width: $grid-unit * 25;
display: flex;
align-items: center;
width: max-content;
padding: $grid-unit * 0.75 $grid-unit * 2;
padding: $grid-unit-10 * 0.75 $grid-unit-10 * 2;
}

// Submenu links only
.wp-block-navigation-link {

&:first-child:not(:only-child) .wp-block-navigation-link__content {
padding-top: $grid-unit;
padding-top: $grid-unit-10;
}

&:last-child .wp-block-navigation-link__content {
padding-bottom: $grid-unit;
padding-bottom: $grid-unit-10;
}
}

&.has-child .wp-block-navigation-link__content {
min-width: 100%;
padding-right: $grid-unit * 4;
padding-right: $grid-unit-10 * 4;
position: relative;
}

.wp-block-navigation-link__submenu-icon {
position: absolute;
right: $grid-unit * 2;
right: $grid-unit-10 * 2;

svg {
fill: currentColor;
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/search/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
color: $dark-opacity-300;
font-family: $default-font;
font-size: $default-font-size;
padding: $grid-unit;
padding: $grid-unit-10;

&:focus {
outline: none;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/custom-gradient-picker/style.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$components-custom-gradient-picker__padding: 3px; // 24px container, 18px handles inside, that leaves 6px padding, half of which is 3.

.components-custom-gradient-picker {
margin-top: $grid-unit;
margin-top: $grid-unit-10;
}

.components-custom-gradient-picker__gradient-bar:not(.has-gradient) {
Expand Down

0 comments on commit 30c78f7

Please sign in to comment.