closes netbox-community#16907: changed default widget color to primar…

…y color
andrewgormley · Jul 15, 2024 · bb2dbe6 · bb2dbe6
1 parent e7e538c
commit bb2dbe6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
@@ -276,6 +276,7 @@ class DashboardWidgetColorChoices(ChoiceSet):
     GRAY = 'gray'
     BLACK = 'black'
     WHITE = 'white'
+    NETBOXTEAL = 'primary'
 
     CHOICES = (
         (BLUE, _('Blue')),
@@ -291,6 +292,7 @@ class DashboardWidgetColorChoices(ChoiceSet):
         (GRAY, _('Gray')),
         (BLACK, _('Black')),
         (WHITE, _('White')),
+        (NETBOXTEAL, _('NetBox Teal')),
     )
 
 

diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py
@@ -26,7 +26,7 @@
         'width': 4,
         'height': 5,
         'title': 'Bookmarks',
-        'color': 'orange',
+        'color': 'primary',
     },
     {
         'widget': 'extras.ObjectCountsWidget',
@@ -46,7 +46,7 @@
         'width': 4,
         'height': 2,
         'title': 'Welcome!',
-        'color': 'green',
+        'color': 'primary',
         'config': {
             'content': (
                 'This is your personal dashboard. Feel free to customize it by rearranging, resizing, or removing '
@@ -128,7 +128,6 @@
         'width': 12,
         'height': 5,
         'title': 'Change Log',
-        'color': 'blue',
         'config': {
             'model': 'core.objectchange',
             'page_size': 25,

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
@@ -45,6 +45,7 @@ pre {
   @include color-mode(dark, true) {
     --#{$prefix}alert-color: darken(var(--#{$prefix}warning),10%);
     --#{$prefix}link-color: #{$bright-teal};
+    --#{$prefix}primary-rgb: 0,242,212;
     --#{$prefix}secondary: #{$gray-400};
   }
 }
@@ -69,6 +70,16 @@ pre {
 // Dark mode overrides
 body[data-bs-theme=dark] {
 
+  // Change content color when primary teal changes with theme
+  .bg-primary, {
+    .card-title,a,i {
+      color: $rich-black!important;
+    }
+  }
+  .text-bg-primary {
+    color: $rich-black!important;
+  }
+
   // Altering background colors
   .card {
     background: $rich-black!important;

diff --git a/netbox/project-static/styles/transitional/_tables.scss b/netbox/project-static/styles/transitional/_tables.scss
@@ -65,12 +65,9 @@ body[data-bs-theme=dark] {
 
   // Adjust dark table link color without affecting buttons and badges
   table {
-    a:not(.btn) {
+    a:not(.btn,.badge a) {
       color: $bright-teal;
     }
-    .badge a {
-      color: inherit;
-    }
     // Stops table headers from appearing as primary link color
     th.orderable a {
       color: var(--#{$prefix}body-color);
@@ -79,7 +76,7 @@ body[data-bs-theme=dark] {
 
   table.object-list {
     a {
-      color: var(--#{$prefix}body-color);
+      color: var(--#{$prefix}body-color)!important;
     }
   }
 }