From b2be59896a3690c121ebe4f55fb2fe3b02c840ac Mon Sep 17 00:00:00 2001
From: Andrew Gormley <Andrew@MacBook-Pro-3.local>
Date: Thu, 4 Jul 2024 16:47:16 +0100
Subject: [PATCH] fixed #16648: dashboard contrast issues

---
 netbox/project-static/dist/netbox.css         | Bin 553341 -> 553428 bytes
 .../styles/overrides/_tabler.scss             |  13 +++++++++++++
 netbox/templates/extras/dashboard/widget.html |   6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index fc27a79e7c1bc96fc1506e382205f44a45c95efe..3e332c0cb7d852f8f4a689420a1704d33d1735dc 100644
GIT binary patch
delta 120
zcmezSNb$;J#fBEf7N!>F7M2#)7Pc1lEgUV;Dmr@UMVTqO#U+W!*$R5eiA5>88L5dW
zsYQB8>AESYX^EvdCDRSfIHaae*v!T;{lEzpuIU@1Ie4USXj4e6p8mg^S#tZHXpV!T
E09~Rh>i_@%

delta 41
xcmcceSn=;8#fBEf7N!>F7M2#)7Pc1lEgUV;)8i93l%^jz!NRqjJ%;0~C;(s{4_yEN

diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
index 120f37990..92c536e02 100644
--- a/netbox/project-static/styles/overrides/_tabler.scss
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -66,6 +66,19 @@ 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 39be16145..2025c2c2d 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 text-{{ widget.fg_color }} bg-{{ widget.color|default:"secondary" }} px-2 py-1 d-flex flex-row">
+    <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">
       <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 text-{{ widget.fg_color }}"></i>
+        <i class="mdi mdi-cog {% if widget.color and widget.color != 'gray' %} 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 text-{{ widget.fg_color }}"></i>
+        <i class="mdi mdi-close {% if widget.color and widget.color != 'gray' %} text-{{ widget.fg_color }} {% endif %}"></i>
       </a>
     </div>
     <div class="card-body p-2 pt-1 overflow-auto">