From 8f4197c0207dd9467dc09b8e89dfcd896b2c8a79 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 22 Dec 2020 10:28:09 -0500
Subject: [PATCH] Fixes #5518: Fix persistent vertical scrollbar

---
 docs/release-notes/version-2.10.md | 8 ++++++++
 netbox/project-static/css/base.css | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index 27965090b..91a65fbfe 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -1,5 +1,13 @@
 # NetBox v2.10
 
+## v2.10.3 (FUTURE)
+
+### Bug Fixes
+
+* [#5518](https://github.com/netbox-community/netbox/issues/5518) - Fix persistent vertical scrollbar
+
+---
+
 ## v2.10.2 (2020-12-21)
 
 ### Enhancements
diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index 681565b9e..94bd74a46 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -14,21 +14,21 @@ body {
 .wrapper {
     min-height: 100%;
     height: auto !important;
-    margin: 0 auto -61px; /* the bottom margin is the negative value of the footer's height */
+    margin: 0 auto -48px; /* the bottom margin is the negative value of the footer's height */
     padding-bottom: 30px;
 }
 .navbar-brand {
     padding: 12px 15px 8px;
 }
 .footer, .push {
-    height: 60px; /* .push must be the same height as .footer */
+    height: 48px; /* .push must be the same height as .footer */
 }
 .footer {
     background-color: #f5f5f5;
     border-top: 1px solid #d0d0d0;
 }
 footer p {
-    margin: 20px 0;
+    margin: 12px 0;
 }
 #navbar_search {
     padding: 0 8px;