From f9aebb77d79f4619aeaab904180986470700d1f7 Mon Sep 17 00:00:00 2001 From: Jack P Date: Tue, 8 Aug 2017 19:55:08 +0100 Subject: [PATCH] Fix inconsistent footer width (#3723) --- CHANGELOG.txt | 1 + docs/releases/1.12.rst | 1 + .../static_src/wagtailadmin/scss/core.scss | 10 +++------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4f2f0b39a..e8c3c370e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -21,6 +21,7 @@ Changelog * Fix: StructBlock values no longer render HTML templates as their `str` representation, to prevent infinite loops in debugging / logging tools (Matt Westcott) * Fix: Removed deprecated jQuery ``load`` call from TableBlock initialisation (Jack Paine) * Fix: Position of options in mobile nav-menu (Jack Paine) + * Fix: Center page editor footer regardless of screen width (Jack Paine) 1.11.1 (07.07.2017) diff --git a/docs/releases/1.12.rst b/docs/releases/1.12.rst index 9cf31eec7..527e6473f 100644 --- a/docs/releases/1.12.rst +++ b/docs/releases/1.12.rst @@ -41,6 +41,7 @@ Bug fixes * StructBlock values no longer render HTML templates as their ``str`` representation, to prevent infinite loops in debugging / logging tools (Matt Westcott) * Removed deprecated jQuery ``load`` call from TableBlock initialisation (Jack Paine) * Position of options in mobile nav-menu (Jack Paine) + * Center page editor footer regardless of screen width (Jack Paine) Upgrade considerations ====================== diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss index 7ce94a218..d0a03427a 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/core.scss @@ -435,8 +435,9 @@ footer, } footer { - width: 80%; - margin-left: 50px; + margin-left: $desktop-nice-padding; + margin-right: $desktop-nice-padding; + width: calc(100% - #{$menu-width} - #{2 * $desktop-nice-padding}); } .content { @@ -461,11 +462,6 @@ footer, } } - footer { - width: 80%; - margin-left: 50px; - } - // Z-indexes .nav-main {