diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f3da498c98..389ac38a1d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -32,6 +32,7 @@ Changelog * Fix: Direct usage of `Document` model replaced with `get_document_model` function in `wagtail.contrib.wagtailmedusa` and in `wagtail.contrib.wagtailapi` * Fix: Failures on sending moderation notification emails now produce a warning, rather than crashing the admin page outright (Matt Fozard) * Fix: All admin forms that could potentially include file upload fields now specify `multipart/form-data` where appropriate (Tim Heap) +* Fix: REM units in Wagtailuserbar caused incorrect spacing (Vincent Audebert) 1.4.4 (xx.xx.2016) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index e935697e31..9b1a00b4fb 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -125,6 +125,7 @@ Contributors * Andy Babic * Tomas Olander * Andrew Tork Baker +* Vincent Audebert Translators =========== diff --git a/docs/releases/1.5.rst b/docs/releases/1.5.rst index e18016921a..a26906d673 100644 --- a/docs/releases/1.5.rst +++ b/docs/releases/1.5.rst @@ -61,6 +61,7 @@ Bug fixes * Direct usage of ``Document`` model replaced with ``get_document_model`` function in ``wagtail.contrib.wagtailmedusa`` and in ``wagtail.contrib.wagtailapi`` * Failures on sending moderation notification emails now produce a warning, rather than crashing the admin page outright (Matt Fozard) * Fix: All admin forms that could potentially include file upload fields now specify ``multipart/form-data`` where appropriate (Tim Heap) +* Fix: REM units in Wagtailuserbar caused incorrect spacing (Vincent Audebert) Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss index 6ed3108d6f..bb3090aa06 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/userbar.scss @@ -3,13 +3,12 @@ @import 'wagtailadmin/scss/font-icons'; @import 'wagtailadmin/scss/variables-icons'; - // ============================================================================= // Variables // ============================================================================= $size-home-button: 3.5em; -$position: 2rem; +$position: 2em; $width-arrow: .6em; $box-shadow-props: 0 0 1px 0 rgba(107, 214, 230, 1); $max-items: 12; @@ -239,7 +238,7 @@ $positions: ( input { font-size: 14px !important; text-align: left; - padding: 0.8rem 1.7rem 0.8rem 3.5rem; + padding: 0.8em 1.7em 0.8em 2.7em; } input { @@ -274,11 +273,11 @@ $positions: ( .#{$namespace}-userbar-nav .#{$namespace}-userbar__item { // Yes, we could use an @else, but there's a bug in scss-lint. @if $vertical == 'bottom' { - transform: translateY(1rem); + transform: translateY(1em); } @if $vertical == 'top' { - transform: translateY(-1rem); + transform: translateY(-1em); } }