From 2d122fcd3dec21feb0b5de8d69b007b1f0744c46 Mon Sep 17 00:00:00 2001
From: Andrew Gormley <Andrew@MacBook-Pro-3.local>
Date: Tue, 9 Jul 2024 15:20:42 +0100
Subject: [PATCH] fixed #16648: created gridstack override and removed inline
 bug fix

---
 netbox/project-static/dist/netbox.css         | Bin 553474 -> 553528 bytes
 netbox/project-static/styles/netbox.scss      |   1 +
 .../styles/overrides/_gridstack.scss          |  12 ++++++++++++
 .../styles/overrides/_tabler.scss             |  13 -------------
 netbox/templates/extras/dashboard/widget.html |   6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 netbox/project-static/styles/overrides/_gridstack.scss

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index d5faacb5aa511a61ff96b578347bdd17b691b85c..55c93ba2ce834deb3e654590e85b4026972c414a 100644
GIT binary patch
delta 57
zcmV-90LK4<<RQ4^A%KJdgaU*Egam{Iga(8Mv<QA!m)~0m7?+(}2z9r9SO^9KmyKWu
PBA39(1PZqYTnPIWZrv2O

delta 44
zcmdn-M6v0KVnYjK3sVbo3rh=Y3tJ2O7LK}z?c9+ZY|M;0)9WHQdbfMTaC{I20AxT8
A(f|Me

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index af2905312..46d8da9aa 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -6,6 +6,7 @@
 
 // Overrides of external libraries
 @import 'overrides/bootstrap';
+@import 'overrides/gridstack';
 @import 'overrides/tabler';
 @import 'overrides/tomselect';
 
diff --git a/netbox/project-static/styles/overrides/_gridstack.scss b/netbox/project-static/styles/overrides/_gridstack.scss
new file mode 100644
index 000000000..ecb5d9a4c
--- /dev/null
+++ b/netbox/project-static/styles/overrides/_gridstack.scss
@@ -0,0 +1,12 @@
+// Altering dashboard card colors
+.grid-stack {
+  .card-header {
+    // Default color of card header changes depending on theme
+    &.bg-default {
+      background: var(--tblr-bg-surface-secondary)!important;
+    }
+    a {
+      color: inherit!important;
+    }
+  }
+}
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
index f566377ca..20ebabab0 100644
--- a/netbox/project-static/styles/overrides/_tabler.scss
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -66,19 +66,6 @@ table th.orderable a {
   background: var(--tblr-bg-surface-secondary)!important;
 }
 
-// Altering dashboard card colors
-.grid-stack {
-  .card-header {
-    // Default color of card header changes depending on theme
-    &.bg-default {
-      background: var(--tblr-bg-surface-secondary)!important;
-    }
-    a {
-      color: inherit!important;
-    }
-  }
-}
-
 .footer .text-primary {
   color: $rich-black!important;
 }
diff --git a/netbox/templates/extras/dashboard/widget.html b/netbox/templates/extras/dashboard/widget.html
index 2025c2c2d..51b40342e 100644
--- a/netbox/templates/extras/dashboard/widget.html
+++ b/netbox/templates/extras/dashboard/widget.html
@@ -9,14 +9,14 @@
     gs-id="{{ widget.id }}"
 >
   <div class="card grid-stack-item-content">
-    <div class="card-header {% if widget.color and widget.color != 'gray' %} text-{{ widget.fg_color }} {% endif %} bg-{{ widget.color|default:'default' }} px-2 py-1 d-flex flex-row">
+    <div class="card-header {% if widget.color %} text-{{ widget.fg_color }} {% endif %} bg-{{ widget.color|default:'default' }} px-2 py-1 d-flex flex-row">
       <a href="#"
         hx-get="{% url 'extras:dashboardwidget_config' id=widget.id %}"
         hx-target="#htmx-modal-content"
         data-bs-toggle="modal"
         data-bs-target="#htmx-modal"
       >
-        <i class="mdi mdi-cog {% if widget.color and widget.color != 'gray' %} text-{{ widget.fg_color }} {% endif %}"></i>
+        <i class="mdi mdi-cog {% if widget.color %} text-{{ widget.fg_color }} {% endif %}"></i>
       </a>
       <div class="card-title flex-fill text-center">
         {% if widget.title %}
@@ -29,7 +29,7 @@
         data-bs-toggle="modal"
         data-bs-target="#htmx-modal"
       >
-        <i class="mdi mdi-close {% if widget.color and widget.color != 'gray' %} text-{{ widget.fg_color }} {% endif %}"></i>
+        <i class="mdi mdi-close {% if widget.color %} text-{{ widget.fg_color }} {% endif %}"></i>
       </a>
     </div>
     <div class="card-body p-2 pt-1 overflow-auto">