From 5a8f468c2d62964e64c07448377b720f60392a5c Mon Sep 17 00:00:00 2001 From: Andreas Bernacca Date: Wed, 13 Nov 2019 21:57:30 +0100 Subject: [PATCH] Fix layout issue when using FieldRowPanel with a heading Resolves #5691 --- CHANGELOG.txt | 1 + docs/releases/2.8.rst | 1 + .../static_src/wagtailadmin/scss/layouts/page-editor.scss | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5114deb85..2aa30666f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,6 +22,7 @@ Changelog * Fix: Moved `get_document_model` location so it can be imported when Models are not yet loaded (Andrey Smirnov) * Fix: Fixed incorrect HTML escaping of Jinja2 form templates for StructBlocks (Brady Moe) * Fix: All templates with wagtailsettings and modeladmin now use `block.super` for `extra_js` & `extra_css` (Timothy Bautista) + * Fix: Layout issue when using FieldRowPanel with a heading (Andreas Bernacca) 2.7 LTS (06.11.2019) ~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/releases/2.8.rst b/docs/releases/2.8.rst index c621485f6..12f00f971 100644 --- a/docs/releases/2.8.rst +++ b/docs/releases/2.8.rst @@ -36,6 +36,7 @@ Bug fixes * Moved ``get_document_model`` location so it can be imported when Models are not yet loaded (Andrey Smirnov) * Fixed incorrect HTML escaping of Jinja2 form templates for StructBlocks (Brady Moe) * All templates with wagtailsettings and modeladmin now use ``block.super`` for ``extra_js`` & ``extra_css`` (Timothy Bautista) + * Layout issue when using FieldRowPanel with a heading (Andreas Bernacca) Upgrade considerations diff --git a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss index 3a364d601..8689b5df8 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss @@ -63,6 +63,10 @@ $object-title-height: 40px; padding-right: 0; } + .field-row { + padding-top: $object-title-height + 12px; + } + .object-help { display: block; position: relative;