Account for mobile and top toolbar in one go

WordPress · Feb 1, 2021 · a4ac41e · a4ac41e
1 parent 35be50a
commit a4ac41e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
@@ -104,7 +104,7 @@ export default function BlockToolbar( { hideDragHandle } ) {
 
 	return (
 		<div className={ classes }>
-			{ ! isMultiToolbar && (
+			{ ! isMultiToolbar && ! displayHeaderToolbar && (
 				<BlockParentSelector clientIds={ blockClientIds } />
 			) }
 			<div ref={ nodeRef } { ...showMoversGestures }>

diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -52,11 +52,6 @@
 	position: absolute;
 	top: -$border-width;
 	left: calc(-#{$grid-unit-60} - #{$grid-unit-10} - #{$border-width});
-
-	// Top Toolbar.
-	.edit-post-header-toolbar__block-toolbar & {
-		display: none;
-	}
 }
 
 // Block controls.