From e5691df666a774c1a73825a941398630aa1d1b26 Mon Sep 17 00:00:00 2001
From: Andrew Gormley <andrewgormley91@gmail.com>
Date: Tue, 16 Jul 2024 19:29:40 +0100
Subject: [PATCH] 16650 button contrast issues (#16845)

* fixed #16650: button contrast issues

* fixed #16650: green bg text contrast issue

* Revert errant JS resource updates

* Revert custom button colors

* Fix indentation

---------

Co-authored-by: Andrew Gormley <Andrew@MacBook-Pro-3.local>
Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
---
 netbox/project-static/dist/netbox.css         | Bin 554200 -> 554686 bytes
 .../styles/overrides/_tabler.scss             |  28 ++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 560da785c118f4b2f38864cfe91e981b7c369d80..fc7f3ca9df0fc34314c4868995c5315fd2774a23 100644
GIT binary patch
delta 341
zcmccdQgPo~#fBEf7N!>F7M2#)7Pc1lEgTDCC!dfK;55)NGBMIIGBlbzUrK^sw<tZy
zN&z9(z$jvwl$30ooMNr3TauJhq+3vwnVVQtX{DfSVBlutVuB{Fo0bliGBhzVo;;65
zoE>WVbj5kBQhY!?Ac<PN#GKTklIb6#*~O<{h~@aot(R1iXO)(pTv}W`&5A>2dhc9T
z9`5|olAO%ER4b!`is=hmn1rXVo5#v-ub7!zkY7}im{(E@(xnSkrCXeuoS&Bhbedjb
za!F=cst$J9$qRo-Og?acodxJp&FLTGIV88=jpLZd$e*Z}Qj}kil3$*un^}^YJKZpz
hLu&f@1P-?8)d?I+ryHMU5}Ljxjze?1WFp6YVF2x!ba?;(

delta 63
zcmV-F0Kosg?IGCdA%KJdgaU*Egam{Iga(8Mv<RSGm*`yx61Qw#2onL9d1D9|mu*@B
V8n<j<2!sKbA7Tilw+3SfxD)qA76$+T

diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
index 20ebabab0..c84274a21 100644
--- a/netbox/project-static/styles/overrides/_tabler.scss
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -49,7 +49,13 @@ table th.orderable a {
   @include color-mode(dark, true) {
     --#{$prefix}alert-color: darken(var(--#{$prefix}warning),10%);
     --#{$prefix}link-color: #{$bright-teal};
+    --#{$prefix}link-color-rgb: 0,242,212;
+    --#{$prefix}link-hover-color-rgb: 0,242,212;
     --#{$prefix}secondary: #{$gray-400};
+    --#{$prefix}primary: #{$bright-teal};
+    --#{$prefix}primary-fg: #{$rich-black};
+    --#{$prefix}primary-rgb: 0,242,212;
+    --#{$prefix}btn-active-color: #{$rich-black};
   }
 }
 
@@ -70,6 +76,22 @@ table th.orderable a {
   color: $rich-black!important;
 }
 
+// Add button focus state
+.btn:focus {
+  border: 1px solid var(--tblr-primary-fg);
+  outline: 2px solid var(--tblr-primary)!important;
+}
+
+// Fix secondary combo button contrast
+.btn-outline-secondary {
+  &.active {
+    color: var(--tblr-primary-fg);
+  }
+  &:hover {
+    color: var(--tblr-primary-fg);
+  }
+}
+
 // Dark mode overrides
 body[data-bs-theme=dark] {
 
@@ -86,6 +108,9 @@ body[data-bs-theme=dark] {
   table {
     a {
       color: $bright-teal;
+      &.dropdown-item {
+        color: inherit;
+      }
     }
     .badge a {
       color: inherit;
@@ -101,6 +126,9 @@ body[data-bs-theme=dark] {
 
   // Adjusting text colors
   .text- {
+    &bg-primary {
+      color: $rich-black!important;
+    }
     &muted {
       color: var(--#{$prefix}secondary-color) !important;
     }