From feee8d5fe2b64170c19e57db8919d6bdd6878b21 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Wed, 24 May 2023 18:40:40 +0400 Subject: [PATCH] Block Toolbar: Fix text only label for locked blocks --- .../src/components/block-lock/style.scss | 15 +++++++++++---- .../src/components/block-toolbar/style.scss | 4 ---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/block-editor/src/components/block-lock/style.scss b/packages/block-editor/src/components/block-lock/style.scss index e05ebc80076f2a..b61447dcf9dc92 100644 --- a/packages/block-editor/src/components/block-lock/style.scss +++ b/packages/block-editor/src/components/block-lock/style.scss @@ -52,10 +52,17 @@ .block-editor-block-lock-toolbar { .components-button.has-icon { min-width: $button-size-small + $grid-unit-15 !important; - padding-left: 0 !important; + } +} - &:focus::before { - right: $grid-unit-10 !important; - } +.block-editor-block-toolbar__block-controls .block-editor-block-lock-toolbar { + margin-left: -$grid-unit-15 * 0.5 !important; +} + +.show-icon-labels { + .block-editor-block-toolbar__block-controls .block-editor-block-lock-toolbar { + border-left: 1px solid $gray-900; + margin-left: $grid-unit-15 * 0.5 !important; + margin-right: -$grid-unit-15 * 0.5; } } diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss index 583c2453ed9d77..0b49c9299212f9 100644 --- a/packages/block-editor/src/components/block-toolbar/style.scss +++ b/packages/block-editor/src/components/block-toolbar/style.scss @@ -110,10 +110,6 @@ } } - .block-editor-block-lock-toolbar { - margin-left: -$grid-unit-15 * 0.5 !important; - } - // @todo: override toolbar group inherited paddings from components/block-tools/style.scss. // This is best fixed by making the mover control area a proper single toolbar group. .components-toolbar-group {