From be64c48c714ef5deeb3cc6787af4f851745d98c2 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 30 Jul 2018 14:49:27 -0400 Subject: [PATCH 1/2] Blocks: Un-collapse Freeform block marins --- core-blocks/freeform/editor.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core-blocks/freeform/editor.scss b/core-blocks/freeform/editor.scss index 56bf9a7aa52583..e3c28dc0d4d1b7 100644 --- a/core-blocks/freeform/editor.scss +++ b/core-blocks/freeform/editor.scss @@ -162,6 +162,12 @@ div[data-type="core/freeform"] .editor-block-contextual-toolbar + div { } } +// Un-collapse freeform block margins. +.editor-block-list__block[data-type="core/freeform"] > .editor-block-list__block-edit { + padding-top: 0.1px; + padding-bottom: 0.1px; +} + // Overwrite inline styles. .freeform-toolbar .mce-tinymce-inline, .freeform-toolbar .mce-tinymce-inline > div, From 56deb8ad35ac0fde0b0bb43c650ae14b5e44edf7 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 30 Jul 2018 16:13:46 -0400 Subject: [PATCH 2/2] Blocks: Position Freeform block toolbar relatively --- core-blocks/freeform/editor.scss | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/core-blocks/freeform/editor.scss b/core-blocks/freeform/editor.scss index e3c28dc0d4d1b7..8921db6abe9e95 100644 --- a/core-blocks/freeform/editor.scss +++ b/core-blocks/freeform/editor.scss @@ -1,8 +1,4 @@ .wp-block-freeform.core-blocks-rich-text__tinymce { - overflow: hidden; - margin: -4px; - padding: 4px; - p, li { line-height: $editor-line-height; @@ -140,11 +136,10 @@ div[data-type="core/freeform"] .editor-block-contextual-toolbar + div { .freeform-toolbar { width: auto; - margin: #{ -$block-padding } #{ -$parent-block-padding }; - margin-bottom: $block-padding; - position: sticky; + margin: 0 #{ -$parent-block-padding }; + position: relative; z-index: z-index( '.freeform-toolbar' ); - top: 0; + top: #{ -1 * $block-padding }; } .freeform-toolbar:empty { @@ -162,12 +157,6 @@ div[data-type="core/freeform"] .editor-block-contextual-toolbar + div { } } -// Un-collapse freeform block margins. -.editor-block-list__block[data-type="core/freeform"] > .editor-block-list__block-edit { - padding-top: 0.1px; - padding-bottom: 0.1px; -} - // Overwrite inline styles. .freeform-toolbar .mce-tinymce-inline, .freeform-toolbar .mce-tinymce-inline > div,