From 65d0cdf55f95bc6f8f85c8fff50b48102dd2bbcc Mon Sep 17 00:00:00 2001 From: Karran Besen Date: Wed, 2 Dec 2020 09:05:13 -0300 Subject: [PATCH] Fix breadcrumb margin overlapping burger menu. Fix #6590 (#6597) Stop menu icon overlapping the breadcrumb on small viewport widths in page editor Co-authored-by: Thibaud Colas --- CHANGELOG.txt | 1 + docs/releases/2.12.rst | 2 +- .../static_src/wagtailadmin/scss/layouts/page-editor.scss | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cc79412f27..166aacd69b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ Changelog ~~~~~~~~~~~~~~~~~ * Added support for Python 3.9 + * Fix: Stop menu icon overlapping the breadcrumb on small viewport widths in page editor (Karran Besen) 2.11.2 (17.11.2020) diff --git a/docs/releases/2.12.rst b/docs/releases/2.12.rst index 0a2d5df59d..e3ba394b9f 100644 --- a/docs/releases/2.12.rst +++ b/docs/releases/2.12.rst @@ -20,7 +20,7 @@ Other features Bug fixes ~~~~~~~~~ - * ... + * Stop menu icon overlapping the breadcrumb on small viewport widths in page editor (Karran Besen) 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 9aa58de006..09031d69d5 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss @@ -7,12 +7,12 @@ .breadcrumb { margin: -1.2em 0 2em; // sass linter complains about $desktop-nice-padding here because of unit mismatch - margin-left: -$desktop-nice-padding; - margin-right: -$desktop-nice-padding; padding-left: calc(#{$desktop-nice-padding} - 2em); @include media-breakpoint-up(sm) { margin-top: -1.8em; + margin-left: -$desktop-nice-padding; + margin-right: -$desktop-nice-padding; } }