From d74e420ed1bb3087ac2d84dd0190171aa0478619 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Jan 2024 16:01:37 -0500 Subject: [PATCH] Clean up top menu --- netbox/project-static/dist/netbox.css | Bin 544539 -> 544591 bytes .../styles/transitional/_navigation.scss | 5 +++ netbox/templates/base/base.html | 9 ++--- netbox/templates/base/layout.html | 33 ++---------------- .../{profile_button.html => user_menu.html} | 1 - 5 files changed, 13 insertions(+), 35 deletions(-) rename netbox/templates/inc/{profile_button.html => user_menu.html} (97%) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 7504fd375af9bf7430ea70c94ead576c86b02dd9..60ea8c21a5ec153a247ee1da7ae4efeaab9bfb09 100644 GIT binary patch delta 59 zcmbO|Px1Ub#fBEf7N!>F7M2#)7Pc1lEgYIYycwy9DXB$zd5L97iAB>J9XKQ=2OMIZ PuJE0WbGwEQ$7d!0Z1EI# delta 31 ncmX>F7M2#)7Pc1lEgYIY+hct=J~06Rw|WY$ diff --git a/netbox/project-static/styles/transitional/_navigation.scss b/netbox/project-static/styles/transitional/_navigation.scss index fe7b8e75a..b849b1045 100644 --- a/netbox/project-static/styles/transitional/_navigation.scss +++ b/netbox/project-static/styles/transitional/_navigation.scss @@ -36,3 +36,8 @@ } } } + +// Header menu styling +header.navbar { + background-color: $bg-surface-secondary; +} diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html index 67f7f9b06..2a8495626 100644 --- a/netbox/templates/base/base.html +++ b/netbox/templates/base/base.html @@ -5,9 +5,6 @@ @@ -47,7 +44,11 @@ {% block head %}{% endblock %} - + {# Page layout #} {% block layout %}{% endblock %} diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index ff5a57cd1..4ed4ce9e0 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -43,12 +43,13 @@ Blocks:
- {# Toggle button #} + {# Nav menu toggle #}
+ {# Dark/light mode toggle #}
@@ -58,37 +59,9 @@ Blocks: -
- - - - - -
-
-
-

Last updates

-
-
-
- Item 1 -
-
- Item 2 -
-
- Item 3 -
-
- Item 4 -
-
-
-
-
{# User menu #} - {% include 'inc/profile_button.html' %} + {% include 'inc/user_menu.html' %}
{# Search box #} diff --git a/netbox/templates/inc/profile_button.html b/netbox/templates/inc/user_menu.html similarity index 97% rename from netbox/templates/inc/profile_button.html rename to netbox/templates/inc/user_menu.html index bebac1f63..735f4dc81 100644 --- a/netbox/templates/inc/profile_button.html +++ b/netbox/templates/inc/user_menu.html @@ -3,7 +3,6 @@ {% if request.user.is_authenticated %}
-
{{ request.user }}
{% if request.user.is_staff %}Staff{% else %}User{% endif %}