diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index 8b6b37a4c..a150e1b3d 100644 Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index 27e804c30..eda89d8fb 100644 Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index f0220c050..43c39157b 100644 Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index e486bc7db..46b252dea 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -174,6 +174,7 @@ span.profile-button .dropdown-menu { margin-top: 0.5rem; box-shadow: $box-shadow; transition: opacity 0.2s ease-in-out; + z-index: 1005; &:not(.show) { pointer-events: none; @@ -1039,3 +1040,38 @@ html { } } } + + +.sticky-bottom-content-p0 { + background-color: $tab-content-bg; + bottom: 0.05em; + z-index: 900; +} +.sticky-bottom-content-p1 { + background-color: $tab-content-bg; + bottom: 1.8em; + z-index: 900; +} + +.sticky-bottom-table-p0 { + background-color: var(--nbx-select-content-bg); + bottom: 0.05em; + z-index: 900; +} +.sticky-bottom-table-p1 { + background-color: var(--nbx-select-content-bg); + bottom: 1.8em; + z-index: 900; +} + +.sticky-top-table-p0 { + background-color: var(--nbx-select-content-bg); + top: 3.5em; + z-index: 900; +} +.sticky-top-table-p1 { + background-color: var(--nbx-select-content-bg); + top: 5.3em; + z-index: 900; +} + diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index c61fb723f..af144c768 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -98,8 +98,7 @@ Context: {% endif %} {% endblock form %} - -
+
{% block buttons %} {% if object.pk %}
{# Form buttons #} -
+
{% block bulk_buttons %} {% if 'bulk_edit' in actions %} diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html index 6f168ac52..cf8850b5a 100644 --- a/netbox/templates/htmx/table.html +++ b/netbox/templates/htmx/table.html @@ -4,10 +4,14 @@ {% with preferences|get_key:"pagination.placement" as paginator_placement %} {% if paginator_placement == 'top' or paginator_placement == 'both' %} - {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %} +
+ {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %} +
{% endif %} {% render_table table 'inc/table_htmx.html' %} {% if paginator_placement != 'top' %} - {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %} +
+ {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %} +
{% endif %} {% endwith %}