EllipsisMenu: Adopt areas Editor, Settings, Tools

WordPress · Jan 12, 2018 · a9a867d · a9a867d
1 parent 106e72d
commit a9a867d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/editor/edit-post/header/editor-actions/index.js b/editor/edit-post/header/editor-actions/index.js
@@ -2,16 +2,18 @@
  * WordPress dependencies
  */
 import { MenuItemsGroup } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
-import './style.scss';
 import CopyContentButton from '../copy-content-button';
 
 export default function EditorActions() {
 	return (
-		<MenuItemsGroup className="editor-actions">
+		<MenuItemsGroup className="editor-actions"
+			label={ __( 'Tools' ) }
+		>
 			<CopyContentButton />
 		</MenuItemsGroup>
 	);

diff --git a/editor/edit-post/header/editor-actions/style.scss b/editor/edit-post/header/editor-actions/style.scss
diff --git a/editor/edit-post/header/ellipsis-menu/index.js b/editor/edit-post/header/ellipsis-menu/index.js
@@ -27,9 +27,10 @@ const element = (
 		renderContent={ ( { onClose } ) => (
 			<div>
 				<ModeSwitcher onSelect={ onClose } />
-				<EditorActions />
 				<div className="editor-ellipsis-menu__separator" />
 				<FixedToolbarToggle onToggle={ onClose } />
+				<div className="editor-ellipsis-menu__separator" />
+				<EditorActions />
 			</div>
 		) }
 	/>

diff --git a/editor/edit-post/header/fixed-toolbar-toggle/index.js b/editor/edit-post/header/fixed-toolbar-toggle/index.js
@@ -21,7 +21,7 @@ function FeatureToggle( { onToggle, active, onMobile } ) {
 	}
 	return (
 		<MenuItemsGroup
-			label={ __( 'Toolbar' ) }
+			label={ __( 'Settings' ) }
 		>
 			<MenuItemsToggle
 				label={ __( 'Fix toolbar to top' ) }