Address remaining feedback and style fixes.

WordPress · Aug 28, 2020 · 1dfe264 · 1dfe264
1 parent 34b4dc1
commit 1dfe264
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/components/src/dropdown-menu/index.js b/packages/components/src/dropdown-menu/index.js
@@ -129,7 +129,7 @@ function DropdownMenu( {
 						aria-haspopup="true"
 						aria-expanded={ isOpen }
 						label={ label }
-						showTooltip={ toggleProps?.showTooltip ?? true }
+						showTooltip={ !! toggleProps?.showTooltip }
 					>
 						{ mergedToggleProps.children }
 					</Button>

diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js
@@ -179,11 +179,11 @@ function HeaderToolbar() {
 									choices={ [
 										{
 											value: 'edit',
-											label: <>{ __( 'Edit' ) }</>,
+											label: __( 'Edit' ),
 										},
 										{
 											value: 'select',
-											label: <>{ __( 'Select' ) }</>,
+											label: __( 'Select' ),
 										},
 									] }
 								/>

diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
@@ -174,9 +174,13 @@
 	}
 	.components-dropdown-menu__toggle {
 		margin-left: $grid-unit;
+		padding-left: $grid-unit;
+		padding-right: $grid-unit;
 
 		@include break-small {
 			margin-left: $grid-unit-15;
+			padding-left: $grid-unit-15;
+			padding-right: $grid-unit-15;
 		}
 	}
 	// The inserter has a custom label, different from its aria-label, so we don't want to display both.
@@ -199,6 +203,7 @@
 }
 
 .edit-post-header__dropdown {
+	.components-menu-item__button.components-menu-item__button,
 	.components-button.editor-history__undo,
 	.components-button.editor-history__redo,
 	.table-of-contents .components-button,