Move block tools CSS

WordPress · Apr 29, 2021 · 9dc1992 · 9dc1992
1 parent 94ddd3d
commit 9dc1992
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 58 deletions.
diff --git a/packages/block-editor/src/components/block-tools/style.scss b/packages/block-editor/src/components/block-tools/style.scss
@@ -159,29 +159,23 @@
 }
 
 // Position mover arrows for both toolbars.
-.block-editor-block-contextual-toolbar,
-.edit-post-header-toolbar__block-toolbar,
-.edit-site-header-toolbar__block-toolbar,
-.edit-navigation-layout__block-toolbar,
-.edit-widgets-header__block-toolbar {
-	.block-editor-block-mover:not(.is-horizontal) {
-		// Position SVGs.
-		.block-editor-block-mover-button {
-			&:focus::before {
-				left: 0 !important;
-				min-width: 0;
-				width: 100%;
-			}
+.block-editor-block-contextual-toolbar .block-editor-block-mover:not(.is-horizontal) {
+	// Position SVGs.
+	.block-editor-block-mover-button {
+		&:focus::before {
+			left: 0 !important;
+			min-width: 0;
+			width: 100%;
 		}
+	}
 
-		@include break-small() {
-			.block-editor-block-mover-button.is-up-button svg {
-				top: 5px;
-			}
+	@include break-small() {
+		.block-editor-block-mover-button.is-up-button svg {
+			top: 5px;
+		}
 
-			.block-editor-block-mover-button.is-down-button svg {
-				bottom: 5px;
-			}
+		.block-editor-block-mover-button.is-down-button svg {
+			bottom: 5px;
 		}
 	}
 }
@@ -253,7 +247,6 @@
 	}
 }
 
-
 /**
  * Popovers.
  */

diff --git a/packages/edit-navigation/src/components/layout/style.scss b/packages/edit-navigation/src/components/layout/style.scss
@@ -64,34 +64,6 @@
 	}
 }
 
-.edit-navigation-layout__block-toolbar {
-	// Make the fixed toolbar appear in a similar position to the floating toolbar.
-	// Take the spacing for the floating toolbar, then subtract the toolbar height and
-	// the gap between the content area and the toolbar.
-	margin-top: $navigation-editor-spacing-top - $block-toolbar-height - $grid-unit-15;
-
-	.block-editor-block-toolbar {
-		background: $white;
-		border: $border-width solid $gray-900;
-		border-radius: $radius-block-ui;
-		max-width: $navigation-editor-width;
-		margin: auto;
-		overflow-y: hidden;
-	}
-
-	.components-toolbar,
-	.components-toolbar-group {
-		border-right-color: $gray-900;
-
-		.components-toolbar,
-		.components-toolbar-group {
-			border-width: 0;
-		}
-	}
-
-	height: $block-toolbar-height;
-}
-
 .edit-navigation-empty-state {
 	max-width: $navigation-editor-width;
 	margin-left: auto;

diff --git a/packages/edit-widgets/src/components/customizer-edit-widgets-initializer/style.scss b/packages/edit-widgets/src/components/customizer-edit-widgets-initializer/style.scss
@@ -3,10 +3,6 @@
 	.edit-widgets-header {
 		margin-top: -16px;
 		border-top: 1px solid $gray-300;
-	}
-
-	.edit-widgets-header,
-	.edit-widgets-header__block-toolbar {
 		background: #fff;
 		margin-left: -12px;
 		margin-right: -12px;

diff --git a/packages/edit-widgets/src/components/header/style.scss b/packages/edit-widgets/src/components/header/style.scss
@@ -27,11 +27,6 @@
 	display: flex;
 }
 
-.edit-widgets-header__block-toolbar {
-	border-bottom: 1px solid $gray-300;
-	border-top: 1px solid $gray-300;
-}
-
 .edit-widgets-header-toolbar {
 	border: none;