From 30c78f7214055f46dad463991a32d700aaa9055c Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 28 Feb 2020 14:49:47 +0100
Subject: [PATCH] avoid using -unit directly

---
 .../src/components/colors-gradients/style.scss   |  4 ++--
 .../src/components/link-control/style.scss       |  2 +-
 .../src/components/rich-text/style.scss          |  2 +-
 .../src/navigation-link/editor.scss              |  6 +++---
 packages/block-library/src/navigation/style.scss | 16 ++++++++--------
 packages/block-library/src/search/editor.scss    |  2 +-
 .../src/custom-gradient-picker/style.scss        |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/block-editor/src/components/colors-gradients/style.scss b/packages/block-editor/src/components/colors-gradients/style.scss
index ffa45ff6718506..cd5992a613cfca 100644
--- a/packages/block-editor/src/components/colors-gradients/style.scss
+++ b/packages/block-editor/src/components/colors-gradients/style.scss
@@ -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;
 	}
 }
 
diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
index 9e4854de4fddde..3dbdcfdb9c7103 100644
--- a/packages/block-editor/src/components/link-control/style.scss
+++ b/packages/block-editor/src/components/link-control/style.scss
@@ -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 {
diff --git a/packages/block-editor/src/components/rich-text/style.scss b/packages/block-editor/src/components/rich-text/style.scss
index cd4005ae15c0ce..d08ae54ce51a7a 100644
--- a/packages/block-editor/src/components/rich-text/style.scss
+++ b/packages/block-editor/src/components/rich-text/style.scss
@@ -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.
diff --git a/packages/block-library/src/navigation-link/editor.scss b/packages/block-library/src/navigation-link/editor.scss
index a72824e487ead2..16a49cea10136a 100644
--- a/packages/block-library/src/navigation-link/editor.scss
+++ b/packages/block-library/src/navigation-link/editor.scss
@@ -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;
 	}
 }
 
diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss
index 51a8fa07025b50..34f003903a0660 100644
--- a/packages/block-library/src/navigation/style.scss
+++ b/packages/block-library/src/navigation/style.scss
@@ -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
@@ -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;
diff --git a/packages/block-library/src/search/editor.scss b/packages/block-library/src/search/editor.scss
index 7168d1a7d79917..db4082f9d2afa0 100644
--- a/packages/block-library/src/search/editor.scss
+++ b/packages/block-library/src/search/editor.scss
@@ -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;
diff --git a/packages/components/src/custom-gradient-picker/style.scss b/packages/components/src/custom-gradient-picker/style.scss
index 027ff0c89ab27c..ed0f6febd6b349 100644
--- a/packages/components/src/custom-gradient-picker/style.scss
+++ b/packages/components/src/custom-gradient-picker/style.scss
@@ -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) {