mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #6023: Fix display of bottom banner with uBlock Origin enabled

Browse Source
This commit is contained in:
Jeremy Stretch
2021-03-24 14:25:09 -04:00
parent 997077fc5d
commit ad2742dbb2
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/release-notes/version-2.10.md
View File

@ -10,6 +10,8 @@
* [#5966](https://github.com/netbox-community/netbox/issues/5966) - Skip Markdown reference link when tabbing through form fields * [#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 * [#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 * [#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
--- ---

3
netbox/project-static/css/base.css
View File

@ -362,9 +362,6 @@ table.report th a {
.text-nowrap { .text-nowrap {
white-space: nowrap; white-space: nowrap;
} }
.banner-bottom {
margin-bottom: 50px;
}
.panel table { .panel table {
margin-bottom: 0; margin-bottom: 0;
} }

2
netbox/templates/base.html
View File

@ -55,7 +55,7 @@
{% block content %}{% endblock %} {% block content %}{% endblock %}
<div class="push"></div> <div class="push"></div>
{% if settings.BANNER_BOTTOM %} {% if settings.BANNER_BOTTOM %}
<div class="alert alert-info text-center banner-bottom" role="alert"> <div class="alert alert-info text-center" style="margin-bottom: 50px" role="alert">
{{ settings.BANNER_BOTTOM|safe }} {{ settings.BANNER_BOTTOM|safe }}
</div> </div>
{% endif %} {% endif %}