Merge pull request #4631 from WordPress/try/new-mover-icons

Try smaller up/down arrows, and focus management
WordPress · Jan 23, 2018 · 4e0358e · 4e0358e
2 parents 5f6e8c6 + 73612cb
commit 4e0358e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/editor/components/block-mover/index.js b/editor/components/block-mover/index.js
@@ -34,7 +34,7 @@ export function BlockMover( { onMoveUp, onMoveDown, isFirst, isLast, uids, block
 			<IconButton
 				className="editor-block-mover__control"
 				onClick={ isFirst ? null : onMoveUp }
-				icon="arrow-up-alt2"
+				icon={ <svg tabIndex="-1" width="18" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M12.293 12.207L9 8.914l-3.293 3.293-1.414-1.414L9 6.086l4.707 4.707z" /></svg> }
 				tooltip={ __( 'Move Up' ) }
 				label={ getBlockMoverLabel(
 					uids.length,
@@ -49,7 +49,7 @@ export function BlockMover( { onMoveUp, onMoveDown, isFirst, isLast, uids, block
 			<IconButton
 				className="editor-block-mover__control"
 				onClick={ isLast ? null : onMoveDown }
-				icon="arrow-down-alt2"
+				icon={ <svg tabIndex="-1" width="18" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M12.293 6.086L9 9.379 5.707 6.086 4.293 7.5 9 12.207 13.707 7.5z" /></svg> }
 				tooltip={ __( 'Move Down' ) }
 				label={ getBlockMoverLabel(
 					uids.length,

diff --git a/editor/components/block-mover/style.scss b/editor/components/block-mover/style.scss
@@ -20,15 +20,30 @@
 		margin-bottom: 4px;
 	}
 
-	&:not(:disabled):hover {
+	// unstyle inherited icon button styles
+	&:not(:disabled):hover,
+	&:not(:disabled):active,
+	&:not(:disabled):focus {
+		box-shadow: none;
+		color: inherit;
+	}
+
+	// apply styles to SVG directly
+	svg {
+		display: block;
+		position: relative; // Fixing the Safari bug for `<button>`s overflow
+		border-radius: 50%;
+	}
+
+	&:not(:disabled):hover svg {
 		@include button-style__hover;
 	}
 
-	&:not(:disabled):active {
+	&:not(:disabled):active svg {
 		@include button-style__active;
 	}
 
-	&:not(:disabled):focus {
+	&:not(:disabled):focus svg {
 		@include button-style__focus-active;
 	}
 }
diff --git a/editor/components/block-mover/test/index.js b/editor/components/block-mover/test/index.js
@@ -32,14 +32,12 @@ describe( 'BlockMover', () => {
 			expect( moveUp.props() ).toMatchObject( {
 				className: 'editor-block-mover__control',
 				onClick: undefined,
-				icon: 'arrow-up-alt2',
 				label: 'Move 2 blocks from position 1 up by one place',
 				'aria-disabled': undefined,
 			} );
 			expect( moveDown.props() ).toMatchObject( {
 				className: 'editor-block-mover__control',
 				onClick: undefined,
-				icon: 'arrow-down-alt2',
 				label: 'Move 2 blocks from position 1 down by one place',
 				'aria-disabled': undefined,
 			} );