From 590bea3b7b47f0bdf90a1557057bd37e04bfd0e8 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 17 Jan 2020 12:58:20 +0000
Subject: [PATCH] Revert "Fix submenu footer blocking items in admin" (#5606)

This change causes the footer to no longer be bottom-aligned when the menu is shorter than window height.

This reverts commit a459e91692659aba04e662978857d14061aecaee.
---
 CHANGELOG.txt                                            | 1 -
 CONTRIBUTORS.rst                                         | 1 -
 client/scss/components/_main-nav.scss                    | 9 ---------
 docs/releases/2.8.rst                                    | 1 -
 .../wagtailadmin/shared/menu_settings_menu_item.html     | 2 +-
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 95e7b71a0..f62219f78 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -24,7 +24,6 @@ Changelog
  * Added cache control headers when serving documents (Johannes Vogel)
  * Use `sensitive_post_parameters` on password reset form (Dan Braghis)
  * Fix: Rename documents listing column 'uploaded' to 'created' (LB (Ben Johnston))
- * Fix: Submenu items longer then the page height are no longer broken by the submenu footer (Igor van Spengen)
  * Fix: Unbundle the l18n library as it was bundled to avoid installation errors which have been resolved (Matt Westcott)
  * Fix: Prevent error when comparing pages that reference a model with a custom primary key (Fidel Ramos)
  * Fix: Moved `get_document_model` location so it can be imported when Models are not yet loaded (Andrey Smirnov)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 9f583c159..8f525158b 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -417,7 +417,6 @@ Contributors
 * kailwallin
 * ryanomor
 * Thijs Baaijen
-* Igor van Spengen
 * Stefani Castellanos
 * Aliosha Padovani
 * Tom Readings
diff --git a/client/scss/components/_main-nav.scss b/client/scss/components/_main-nav.scss
index 29f646bac..5f22b97e9 100644
--- a/client/scss/components/_main-nav.scss
+++ b/client/scss/components/_main-nav.scss
@@ -388,10 +388,6 @@ body.explorer-open {
             width: $menu-width;
         }
 
-        ul {
-            position: relative;
-        }
-
         h2 {
             display: block;
             padding: 0.2em 0;
@@ -413,11 +409,6 @@ body.explorer-open {
 
         .footer {
             position: absolute;
-
-            &-submenu {
-                position: sticky;
-                max-height: unset;
-            }
         }
 
     }
diff --git a/docs/releases/2.8.rst b/docs/releases/2.8.rst
index aa98fbcd1..8a6ada350 100644
--- a/docs/releases/2.8.rst
+++ b/docs/releases/2.8.rst
@@ -49,7 +49,6 @@ Bug fixes
 ~~~~~~~~~
 
  * Rename documents listing column 'uploaded' to 'created' (LB (Ben Johnston))
- * Submenu items longer then the page height are no longer broken by the submenu footer (Igor van Spengen)
  * Unbundle the l18n library as it was bundled to avoid installation errors which have been resolved (Matt Westcott)
  * Prevent error when comparing pages that reference a model with a custom primary key (Fidel Ramos)
  * Moved ``get_document_model`` location so it can be imported when Models are not yet loaded (Andrey Smirnov)
diff --git a/wagtail/admin/templates/wagtailadmin/shared/menu_settings_menu_item.html b/wagtail/admin/templates/wagtailadmin/shared/menu_settings_menu_item.html
index c545b5190..fba4b2f70 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/menu_settings_menu_item.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/menu_settings_menu_item.html
@@ -2,7 +2,7 @@
 {% load wagtailcore_tags %}
 
 {% block menu_footer %}
-    <li class="footer footer-submenu">
+    <li class="footer">
         <div class="menu-item"><p class="wagtail-version">Wagtail v.{% wagtail_version %}</p></div>
     </li>
 {% endblock %}