From a459e91692659aba04e662978857d14061aecaee Mon Sep 17 00:00:00 2001
From: Igoranze <igor.van.spengen@outlook.com>
Date: Mon, 7 Oct 2019 17:05:44 +0200
Subject: [PATCH] Fix submenu footer blocking items in admin

- items longer then the page height are no longer broken by the submenu footer
- long lists of submenu items are no longer blocked by the footer (version number)
---
 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, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f806727c0..4b956e367 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Changelog
  * Removed leftover Python 2.x compatibility code (Sergey Fedoseev)
  * Combine flake8 configurations (Sergey Fedoseev)
  * 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)
 
 2.7 LTS (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 6c3c3fb12..1172cd315 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -417,6 +417,7 @@ Contributors
 * kailwallin
 * ryanomor
 * Thijs Baaijen
+* Igor van Spengen
 
 Translators
 ===========
diff --git a/client/scss/components/_main-nav.scss b/client/scss/components/_main-nav.scss
index 5f22b97e9..29f646bac 100644
--- a/client/scss/components/_main-nav.scss
+++ b/client/scss/components/_main-nav.scss
@@ -388,6 +388,10 @@ body.explorer-open {
             width: $menu-width;
         }
 
+        ul {
+            position: relative;
+        }
+
         h2 {
             display: block;
             padding: 0.2em 0;
@@ -409,6 +413,11 @@ 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 ec873f2cd..7eff759d8 100644
--- a/docs/releases/2.8.rst
+++ b/docs/releases/2.8.rst
@@ -23,6 +23,7 @@ Bug fixes
  * Removed leftover Python 2.x compatibility code (Sergey Fedoseev)
  * Combine flake8 configurations (Sergey Fedoseev)
  * 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)
 
 Upgrade considerations
 ======================
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 fba4b2f70..c545b5190 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">
+    <li class="footer footer-submenu">
         <div class="menu-item"><p class="wagtail-version">Wagtail v.{% wagtail_version %}</p></div>
     </li>
 {% endblock %}