Correct toolbar position

WordPress · Oct 4, 2019 · a3f1547 · a3f1547
1 parent 24f817d
commit a3f1547
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
@@ -526,10 +526,10 @@ function BlockListBlock( {
 				clientId={ clientId }
 				rootClientId={ rootClientId }
 			/> }
-			{ isFirstMultiSelected && (
-				<BlockMultiControls rootClientId={ rootClientId } />
-			) }
 			<div className="editor-block-list__block-edit block-editor-block-list__block-edit">
+				{ isFirstMultiSelected && (
+					<BlockMultiControls rootClientId={ rootClientId } />
+				) }
 				{ shouldRenderMovers && (
 					<BlockMover
 						clientIds={ clientId }

diff --git a/packages/block-editor/src/components/block-list/style.scss b/packages/block-editor/src/components/block-list/style.scss
@@ -161,6 +161,20 @@
 		> .block-editor-block-list__block-edit::before {
 			border-left-color: $dark-opacity-light-800;
 			box-shadow: inset $block-left-border-width 0 0 0 $dark-gray-500;
+
+			.is-dark-theme & {
+				border-left-color: $light-opacity-light-800;
+				box-shadow: inset $block-left-border-width 0 0 0 $light-gray-600;
+			}
+
+			// Switch to outset borders on larger screens.
+			@include break-small() {
+				box-shadow: -$block-left-border-width 0 0 0 $dark-gray-500;
+
+				.is-dark-theme & {
+					box-shadow: -$block-left-border-width 0 0 0 $light-gray-600;
+				}
+			}
 		}
 
 		&.is-multi-selected-first > .block-editor-block-list__block-edit::before {