diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index e016f0923..5209b38eb 100644 Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index 3afaaa9fc..aa7150be7 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -5,6 +5,7 @@ @import '../node_modules/@tabler/core/src/scss/vendor/tom-select'; // Overrides of external libraries +@import 'overrides/bootstrap'; @import 'overrides/tabler'; // Transitional styling to ease migration of templates from NetBox v3.x diff --git a/netbox/project-static/styles/overrides/_bootstrap.scss b/netbox/project-static/styles/overrides/_bootstrap.scss new file mode 100644 index 000000000..f24e18890 --- /dev/null +++ b/netbox/project-static/styles/overrides/_bootstrap.scss @@ -0,0 +1,4 @@ +// Disable smooth scrolling for intra-page links +html { + scroll-behavior: auto !important; +} diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html index b7d4f6fc6..2ae1ebb9b 100644 --- a/netbox/templates/base/base.html +++ b/netbox/templates/base/base.html @@ -21,6 +21,7 @@ + {# Page title #} {% block title %}{% trans "Home" %}{% endblock %} | NetBox diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index 432138ee8..943ec9dbf 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -79,7 +79,7 @@ Blocks: {# Page content #}
-
+
{# Page header #} {% block header %} diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html index 739d4ff08..d9800b27f 100644 --- a/netbox/utilities/templates/navigation/menu.html +++ b/netbox/utilities/templates/navigation/menu.html @@ -1,6 +1,6 @@ {% load helpers %} -
    +
      {% for menu, groups in nav_items %}