diff --git a/packages/editor/src/components/block-list/block.js b/packages/editor/src/components/block-list/block.js index 614fbe9f762f0..c9c26945f06cd 100644 --- a/packages/editor/src/components/block-list/block.js +++ b/packages/editor/src/components/block-list/block.js @@ -427,8 +427,8 @@ export class BlockListBlock extends Component { // Empty paragraph blocks should always show up as unselected. const showEmptyBlockSideInserter = ( isSelected || isHovered ) && isEmptyDefaultBlock && isValid; const showSideInserter = ( isSelected || isHovered ) && isEmptyDefaultBlock; - const shouldAppearSelected = ! isFocusMode && ! hasFixedToolbar && ! showSideInserter && isSelected && ! isTypingWithinBlock; - const shouldAppearHovered = ! isFocusMode && ! hasFixedToolbar && isHovered && ! isEmptyDefaultBlock; + const shouldAppearSelected = ! isFocusMode && ! showSideInserter && isSelected && ! isTypingWithinBlock; + const shouldAppearHovered = ! isFocusMode && isHovered && ! isEmptyDefaultBlock; // We render block movers and block settings to keep them tabbale even if hidden const shouldRenderMovers = ! isFocusMode && ( isSelected || hoverArea === 'left' ) && ! showEmptyBlockSideInserter && ! isMultiSelecting && ! isPartOfMultiSelection && ! isTypingWithinBlock; const shouldShowBreadcrumb = ! isFocusMode && isHovered && ! isEmptyDefaultBlock; diff --git a/packages/editor/src/components/block-list/breadcrumb.js b/packages/editor/src/components/block-list/breadcrumb.js index 2699fb2281161..ca14b1d346c94 100644 --- a/packages/editor/src/components/block-list/breadcrumb.js +++ b/packages/editor/src/components/block-list/breadcrumb.js @@ -1,8 +1,3 @@ -/** - * External dependencies - */ -import classnames from 'classnames'; - /** * WordPress dependencies */ @@ -53,12 +48,10 @@ export class BlockBreadcrumb extends Component { } render() { - const { clientId, rootClientId, isLight } = this.props; + const { clientId, rootClientId } = this.props; return ( - <div className={ classnames( 'editor-block-list__breadcrumb', { - 'is-light': isLight, - } ) }> + <div className={ 'editor-block-list__breadcrumb' }> <Toolbar> { rootClientId && ( <Fragment> @@ -75,12 +68,11 @@ export class BlockBreadcrumb extends Component { export default compose( [ withSelect( ( select, ownProps ) => { - const { getBlockRootClientId, getEditorSettings } = select( 'core/editor' ); + const { getBlockRootClientId } = select( 'core/editor' ); const { clientId } = ownProps; return { rootClientId: getBlockRootClientId( clientId ), - isLight: getEditorSettings().hasFixedToolbar, }; } ), ] )( BlockBreadcrumb ); diff --git a/packages/editor/src/components/block-list/style.scss b/packages/editor/src/components/block-list/style.scss index a1f80ddf8c9ee..1f0e9ffba3f6e 100644 --- a/packages/editor/src/components/block-list/style.scss +++ b/packages/editor/src/components/block-list/style.scss @@ -899,11 +899,6 @@ } } - &.is-light .components-toolbar { - background: rgba($white, 0.5); - color: $dark-gray-700; - } - // Position the breadcrumb closer on mobile. [data-align="left"] &, [data-align="right"] & { diff --git a/packages/editor/src/components/post-title/style.scss b/packages/editor/src/components/post-title/style.scss index 0c8fc2c4ca3e8..c69f22e646dde 100644 --- a/packages/editor/src/components/post-title/style.scss +++ b/packages/editor/src/components/post-title/style.scss @@ -46,7 +46,7 @@ } } - &:not(.is-focus-mode):not(.has-fixed-toolbar) { + &:not(.is-focus-mode) { &.is-selected .editor-post-title__input { // use opacity to work in various editor styles border-color: $dark-opacity-light-500;