Revert/top toolbar tab order (#20571)

* Revert "Fix e2e tests" This reverts commit b7fc515. * Revert "Top toolbar: adjust tab order" This reverts commit a6bfb67.
WordPress · Mar 2, 2020 · 79a8016 · 79a8016
1 parent 7866ae1
commit 79a8016
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/e2e-tests/specs/editor/various/a11y.test.js b/packages/e2e-tests/specs/editor/various/a11y.test.js
@@ -23,7 +23,7 @@ describe( 'a11y', () => {
 			':focus',
 			( focusedElement ) => {
 				return focusedElement.classList.contains(
-					'editor-post-publish-button__button'
+					'block-editor-inserter__toggle'
 				);
 			}
 		);

diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
@@ -58,6 +58,10 @@ function Header() {
 
 	return (
 		<div className="edit-post-header">
+			<div className="edit-post-header__toolbar">
+				<FullscreenModeClose />
+				<HeaderToolbar />
+			</div>
 			<div className="edit-post-header__settings">
 				{ ! isPublishSidebarOpened && (
 					// This button isn't completely hidden by the publish sidebar.
@@ -93,10 +97,6 @@ function Header() {
 				<PinnedPlugins.Slot />
 				<MoreMenu />
 			</div>
-			<div className="edit-post-header__toolbar">
-				<FullscreenModeClose />
-				<HeaderToolbar />
-			</div>
 		</div>
 	);
 }

diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
@@ -3,7 +3,6 @@
 	background: $white;
 	display: flex;
 	flex-wrap: wrap;
-	flex-direction: row-reverse;
 	justify-content: space-between;
 	align-items: center;
 	// The header should never be wider than the viewport, or buttons might be hidden. Especially relevant at high zoom levels. Related to https://core.trac.wordpress.org/ticket/47603#ticket.