From 15385eeda5d487e298410627494b0707179accf7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 11 Jan 2024 10:48:02 -0500
Subject: [PATCH] Remove button colors; hide buttons except on hover/active

---
 netbox/netbox/navigation/__init__.py          |   6 ++----
 netbox/netbox/navigation/menu.py              |  12 ++++--------
 netbox/project-static/dist/netbox.css         | Bin 544150 -> 544495 bytes
 .../styles/transitional/_navigation.scss      |   9 +++++++++
 .../utilities/templates/navigation/menu.html  |   2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/netbox/netbox/navigation/__init__.py b/netbox/netbox/navigation/__init__.py
index 4c7190bbb..63d2af9c1 100644
--- a/netbox/netbox/navigation/__init__.py
+++ b/netbox/netbox/navigation/__init__.py
@@ -79,8 +79,7 @@ def get_model_buttons(app_label, model_name, actions=('add', 'import')):
                 link=f'{app_label}:{model_name}_add',
                 title='Add',
                 icon_class='mdi mdi-plus-thick',
-                permissions=[f'{app_label}.add_{model_name}'],
-                color=ButtonColorChoices.GREEN
+                permissions=[f'{app_label}.add_{model_name}']
             )
         )
     if 'import' in actions:
@@ -89,8 +88,7 @@ def get_model_buttons(app_label, model_name, actions=('add', 'import')):
                 link=f'{app_label}:{model_name}_import',
                 title='Import',
                 icon_class='mdi mdi-upload',
-                permissions=[f'{app_label}.add_{model_name}'],
-                color=ButtonColorChoices.CYAN
+                permissions=[f'{app_label}.add_{model_name}']
             )
         )
 
diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index d4969386e..32b19ef62 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -386,15 +386,13 @@ ADMIN_MENU = Menu(
                             link=f'users:netboxuser_add',
                             title='Add',
                             icon_class='mdi mdi-plus-thick',
-                            permissions=[f'auth.add_user'],
-                            color=ButtonColorChoices.GREEN
+                            permissions=[f'auth.add_user']
                         ),
                         MenuItemButton(
                             link=f'users:netboxuser_import',
                             title='Import',
                             icon_class='mdi mdi-upload',
-                            permissions=[f'auth.add_user'],
-                            color=ButtonColorChoices.CYAN
+                            permissions=[f'auth.add_user']
                         )
                     )
                 ),
@@ -409,15 +407,13 @@ ADMIN_MENU = Menu(
                             link=f'users:netboxgroup_add',
                             title='Add',
                             icon_class='mdi mdi-plus-thick',
-                            permissions=[f'auth.add_group'],
-                            color=ButtonColorChoices.GREEN
+                            permissions=[f'auth.add_group']
                         ),
                         MenuItemButton(
                             link=f'users:netboxgroup_import',
                             title='Import',
                             icon_class='mdi mdi-upload',
-                            permissions=[f'auth.add_group'],
-                            color=ButtonColorChoices.CYAN
+                            permissions=[f'auth.add_group']
                         )
                     )
                 ),
diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 8c28a6c30162fb661ef169be0e2895c654a28df3..77d72b2c79ddfe860f2984fdab2e78d96bda8bd1 100644
GIT binary patch
delta 159
zcmbO>Tk-u|#fBEf7N!>F7M2#)7Pc1lEgTM>vI=@hC3(8(Mfs%#)n%E*nMs*BnI)B0
z8JQ_5sd>{kTCti=SMXw$o$lz#ad-L#PY!l2gof!3i<m^FZ?a-FnSQ{QRe5@uCcDt|
m2v3fP=?7l1uuspK&B{4_z8428LJ2pLbzt4wmw0h}VgdkbX*XK{

delta 46
zcmV+}0MY;NogtQ+A%KJdgaU*Egam{Iga(8Mv<N^+m##?&-j~4Y1P7N0O9+3r{Ywb)
E0-IqGsQ>@~

diff --git a/netbox/project-static/styles/transitional/_navigation.scss b/netbox/project-static/styles/transitional/_navigation.scss
index 0d2571cfc..fe7b8e75a 100644
--- a/netbox/project-static/styles/transitional/_navigation.scss
+++ b/netbox/project-static/styles/transitional/_navigation.scss
@@ -6,6 +6,9 @@
         a {
           color: inherit;
         }
+        .btn-group {
+          visibility: hidden;
+        }
 
         // Adjust hover color & style for menu items
         &:hover {
@@ -13,6 +16,9 @@
           a {
             text-decoration: none;
           }
+          .btn-group {
+            visibility: visible;
+          }
         }
 
         // Style active menu item
@@ -21,6 +27,9 @@
           a {
             color: white;
           }
+          .btn-group {
+            visibility: visible;
+          }
         }
 
       }
diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html
index 18be3c717..6b9c52e7b 100644
--- a/netbox/utilities/templates/navigation/menu.html
+++ b/netbox/utilities/templates/navigation/menu.html
@@ -28,7 +28,7 @@
                   {% if buttons %}
                     <div class="btn-group ms-1">
                       {% for button in buttons %}
-                        <a href="{% url button.link %}" class="btn btn-sm btn-{{ button.color }} lh-2" title="{{ button.title }}">
+                        <a href="{% url button.link %}" class="btn btn-sm btn-{{ button.color|default:"outline-dark" }} lh-2" title="{{ button.title }}">
                           <i class="{{ button.icon_class }}"></i>
                         </a>
                       {% endfor %}