From ad2742dbb2980f7aa0f5325e94b558caade27528 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 24 Mar 2021 14:25:09 -0400 Subject: [PATCH] Fixes #6023: Fix display of bottom banner with uBlock Origin enabled --- docs/release-notes/version-2.10.md | 2 ++ netbox/project-static/css/base.css | 3 --- netbox/templates/base.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md index f50a9814e..bb84353c6 100644 --- a/docs/release-notes/version-2.10.md +++ b/docs/release-notes/version-2.10.md @@ -10,6 +10,8 @@ * [#5966](https://github.com/netbox-community/netbox/issues/5966) - Skip Markdown reference link when tabbing through form fields * [#5977](https://github.com/netbox-community/netbox/issues/5977) - Correct validation of `RELEASE_CHECK_URL` config parameter * [#6006](https://github.com/netbox-community/netbox/issues/6006) - Fix VLAN group/site association for bulk prefix import +* [#6010](https://github.com/netbox-community/netbox/issues/6010) - Eliminate duplicate virtual chassis search results +* [#6023](https://github.com/netbox-community/netbox/issues/6023) - Fix display of bottom banner with uBlock Origin enabled --- diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index efdca81be..8887fb6b6 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -362,9 +362,6 @@ table.report th a { .text-nowrap { white-space: nowrap; } -.banner-bottom { - margin-bottom: 50px; -} .panel table { margin-bottom: 0; } diff --git a/netbox/templates/base.html b/netbox/templates/base.html index f3129d7dd..155c0d9b2 100644 --- a/netbox/templates/base.html +++ b/netbox/templates/base.html @@ -55,7 +55,7 @@ {% block content %}{% endblock %}
{% if settings.BANNER_BOTTOM %} -