diff --git a/core-blocks/block/edit-panel/index.js b/core-blocks/block/edit-panel/index.js index 24b42a2cdb7230..cf671bcda651a3 100644 --- a/core-blocks/block/edit-panel/index.js +++ b/core-blocks/block/edit-panel/index.js @@ -18,6 +18,7 @@ class ReusableBlockEditPanel extends Component { this.titleField = createRef(); this.editButton = createRef(); + this.editForm = createRef(); this.handleFormSubmit = this.handleFormSubmit.bind( this ); this.handleTitleChange = this.handleTitleChange.bind( this ); this.handleTitleKeyDown = this.handleTitleKeyDown.bind( this ); @@ -35,7 +36,7 @@ class ReusableBlockEditPanel extends Component { if ( ! prevProps.isEditing && this.props.isEditing ) { this.titleField.current.select(); } - // Move focus back to the Edit button after pressing the Escape key, Cancel, or Save. + // Move focus back to the Edit button after pressing the Escape key or after saving. if ( ( prevProps.isEditing || prevProps.isSaving ) && ! this.props.isEditing && ! this.props.isSaving ) { this.editButton.current.focus(); } @@ -58,7 +59,7 @@ class ReusableBlockEditPanel extends Component { } render() { - const { isEditing, title, isSaving, onEdit, onCancel, instanceId } = this.props; + const { isEditing, title, isSaving, onEdit, instanceId } = this.props; return ( @@ -78,7 +79,11 @@ class ReusableBlockEditPanel extends Component { ) } { ( isEditing || isSaving ) && ( -
+
diff --git a/core-blocks/block/edit-panel/style.scss b/core-blocks/block/edit-panel/style.scss index 08b22d1f04b071..44c63538619328 100644 --- a/core-blocks/block/edit-panel/style.scss +++ b/core-blocks/block/edit-panel/style.scss @@ -38,10 +38,6 @@ margin: #{ $item-spacing / 2 } 0 $item-spacing; } - .components-button.reusable-block-edit-panel__button { - margin: 0 5px 0 0; - } - @include break-large() { flex-wrap: nowrap; diff --git a/packages/editor/src/components/post-permalink/editor.js b/packages/editor/src/components/post-permalink/editor.js index 3185fd2abe6ea6..abc51bcf485419 100644 --- a/packages/editor/src/components/post-permalink/editor.js +++ b/packages/editor/src/components/post-permalink/editor.js @@ -71,7 +71,7 @@ class PostPermalinkEditor extends Component { isLarge onClick={ this.onSavePermalink } > - { __( 'OK' ) } + { __( 'Save' ) } ); @@ -91,4 +91,3 @@ export default compose( [ return { editPost }; } ), ] )( PostPermalinkEditor ); - diff --git a/packages/editor/src/components/post-permalink/style.scss b/packages/editor/src/components/post-permalink/style.scss index 30e1600bfd6a06..8740ad31264b6e 100644 --- a/packages/editor/src/components/post-permalink/style.scss +++ b/packages/editor/src/components/post-permalink/style.scss @@ -33,6 +33,7 @@ .editor-post-permalink__label { margin: 0 10px 0 5px; + font-weight: 600; } .editor-post-permalink__link {