From 4a962386c06478ed8df5356e70fd10123c36565c Mon Sep 17 00:00:00 2001
From: Andrew Gormley <Andrew@MacBook-Pro-3.local>
Date: Mon, 8 Jul 2024 18:22:20 +0100
Subject: [PATCH] fixed #16650: button contrast issues

---
 netbox/project-static/dist/netbox.css         | Bin 553341 -> 554555 bytes
 netbox/project-static/styles/_variables.scss  |   7 +++
 .../styles/overrides/_tabler.scss             |  52 +++++++++++++++++-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index fc27a79e7c1bc96fc1506e382205f44a45c95efe..9f31fd8fa733f7e58a7598ccb88a5c6165de3d30 100644
GIT binary patch
delta 4355
zcmai1dvH|M8K1p-U&$g#AS59nVZ%GR3wxitO9BKNqF^8PF|DYv+~>00&2HG-1wu<x
zu!HCb;+(O^b^uAS2+Awuk2?cXpp3OMI2ssbiWKN*acZYgu(q|%ROz|*+#5Clrhn}0
z`Of$Ho%4O?`@Z|-2hAr&nvWg~(2{1Fk_K1pBOAeRAT-U4CwaLw8nx7HA*w66lu=k1
zo@tt*EXr`>ezFNv6KiQx5@Wgwb`Uc~%<?tz1xLlzC^gh)WV88o?zR>aL|Ar|Y@C=X
z7)B25VF+MSa26elbtF1FhuVTC0-+=y3G<Q^2`712+(*s<^Qeg-hvs-L5*8Amotjea
z(D9h_13#qBPT)mE%OX<bl0c$krTjcS<-QViA2Eg&Eu_?i*d6CMmU!57l$=xJV#Lf6
zJm7D1EQGxBoa|y8n$0{w(7YteyaWnm9h5A@VkX#GJDrwgPUAH2yV@r3RoSzoVVXL~
z*VTjl<ufVM5Oom@)-}**SJ4&lY55^WMIx%v3Ws+Erh=29dudZkDv4HDITC0ncW+RY
zRH+pXd=jW1icTOYq|EDbD_FXDGF<W^K@EMY>TSY{D>&USgTeRP3aYM6#Ri;MI%G8n
zPpd%cZfu*=)Uu%~)jb5A)J-#~gYVXMP^MzWb@v=-E0&C*a~z;KUJy7Q^whOc0+)y-
z+!F{w%!nE21odE~4lqJInH1vQDPEd-FP#*V9HRYGB$K?tE8Zz4*2@7(7IjX7&u6G=
z(ACi8gK+R;JSF%YB&GNrdPtgPW%2bsx4ns0WnEA;aDHn8sf#AM<n48!|Cts_F_M}N
z+P5@<v(JQ408E_&=XXp4ySF?tH1hP}fESY;+Z$<}Qw>#gOwgvFE1F}i1{s-08ws7$
zM9<1}$}n_U1Dm!K!Ifua3P%zdAdvwX3~y~Dkva!%Y;8x1T0%>LJ=+#hhNdAPzU%LA
zKd{0N+2EBeF#j+s!<RbP4EW~9HQ?%p?9hr!O3;%S8ocsA*=X3>*)v0@{~94nHtZ)4
zjMxW80{gGR_*(=I-?~cF{o-||9A5t;(O{o`lbFn4#-e`_H7?`1cZqs?$vec&P>AED
zi1X~wKitFwJIYJw_y0m9>^J{Re1~B9m>5aMBLb`n20Lz1n?56waQ_FyHFryrBN7bI
zo`6dY+&}`u*9gjPx<(jfWl1E$MYuS2RzkYIsy-pwu&>)q*~nC5;Fjw<09pPI;##?b
zl#|4W$it=O!3Rla2?IBYq<#D|qLcW)2ZrsR6Quq8zllXeSqvc+BFG~A_GO}zbk;EZ
z5wY;8t}h6?>x<yZgLAys=2g(%qNW+Wy|+~mc=<Qvba-w*c@HexM^@32V91gH!~4h@
z$}~}4!q$CceJJUbKwd~XCHf@gmS+&AYDz01{Mswz;x0p$b)NUj+B&6>OXpJ2tmW1W
zlQ)vLvr4KSFFNH`5PYF=rGH$pg<rlxw$X+xn1TtH>?fzRn1*iXW0jHbQU^lZaS*pr
z6S<F^gFA??&{Hh*WDQTcq=v({50Y(^t_z9=D-NN%F$~RA;Xt0My@yAEL<Zdo%%N7)
z2s4MsoioPvqk^HAV8ERMwj3tqMhxBu;K+Gb<s1Z7_E6Qc-0p)QySRPHaUBkzwo-S8
zw&IGxHLsy4-#koKhQ~$+8}U6l!GQ~okW=qR-D`Xx#<fl##$DUi(?`g*W<yqV-W(_E
zr$W+DQQ^J7R9AQ%j~AUh6C|fCpO`f^f$!V^;YX-}!=oq3iU{iAXig|(a4UDy*!PQd
zUAL&IIZ3^AkgOY%)cPQKd;#wIzLwUf<Z#SNI&3KuzJHi(g4tu_#P(QB<BidA#nr^_
zWK%Uq&+qMfi6A&;QO$9>J!lIy+kZMnZazNO6cp63#ywj<g9RimCD2cTKkuf#(T_T=
zaEGUcJ%}h_oE(;7zB&AuaJYGsj|<XmoLi~_3WhZL4zuahYRlIY6w!rfKb)h!9-s_9
zE{g7BC>PN)a1`YPJd>xEQ?3&yi>J&)XvUf>O+JJMoy1AL+S#|`_L9uKQr;9qR36;K
znXoYI2useO#KD()sD~)``keUIl$Tsq^%`o$ELo5-Y-gk#8w<w(dc|?>sm*IBd-EE)
z?k8R!v-f;VUti!8FElcbETi1agjL;4!<gZ)PGi=SPGN)!Voh*gtv4gW;~Fyu6;w3g
zxXh5t#AUz^=?qJFqbzJsBdevAXNk%5-bE8$F`2n{^Ef}n%%x0s%5`nJwZR)H`%_Hu
zZl{>Onz6k3*8x*sI$zqSRx=wDlkm&jIN!=Ey;d}xGxM-&FH-~c0VaYw1AJkCndM*F
zsR3qcz(3#BUo*=+28`}yW_$8KaF;IHO?#P##<{QzC5v7Bb1yT`Lub!;nW=2@W)XPl
z)!+vE*coOefi2pVzh~0Ot2<QM{ckYup;5*CT7cmrNc7@4rX5{6W;eaV{0NO)&X<C{
z?Ok{6K(YUOfqBCpVd1NTNbUajm`(x#&=aN!1DBav2#*CbcI9Pec$I&w=63eHGc-ZC
zs+DEz?=5EkFbV|mF8cEm@FuK~y`zK8`F=)sA=<3~mqsjDzKrGV6%Vo-CV{z?lNhHm
z^Jwt>S!MXvI#3PIJ<8If@3p6p?p6wYsOiRHoqUJrKXh+DYNlKkC-MT=P1gE`Ah(OE
zpNMoE#>V+d)+ktzli7N>V~A$pSC6uP56xGt+(I+26?=aS2jlECxN9dhA(Ss#*>uiW
z$oH&=gHIBZ;mKVTv!prQ-IFg^O3vEos6{=gXs@B=bEsVR%~v!lz1E1_nF|I#uLI{!
zF;xg}3%1}L0G|IX)da8aq#EJr-Bb(Q^E$=A8wGkYys?ui@5i#EUa)y@2*QMuws_@@
zD44({60hBw=WiD>c-39B3>`1kY|#U*Y$z7IWjd#)Q~jQ4JWpWho^;MLftozt!W9s&
zagD?4Y`WXC=C&@p={y3wa%vY|nTlqp`MhV>T9>vgqkvfb=&DgPGKQY^Bvbi(D(e~T
zLs2NI9<dhr^3dvqw5qDUR4Q$)E~?m1I@fC{se;mtNpuwC$LO^%xz;~dZ!g|3r)JYy
z#sPwGsA)?rY8e9y!>XUs^{|BvRKQ=g(N$%$kk!6uA{KKqFFs15>SC<7qG~GYU4c)I
z2C=7*M=Uhcs!G8=_ZT}Is8HtXg?x{mUzdxfEu$L-9!H5g+{LnRpo?7sw>{3zfQ!!(
zweaF&YztiV1bUq{Pp}t)ejWH!VY6j^MOlzxYhYi7t@q#cFEi{)pZT8*%lrGWEL-&V
mUqfrJ>dx*)BDhq-u5NZ!2p1b(-e?tIWsYsMKkQ~-4E_%)vq?k%

delta 3438
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
EAM9)a<NyEw

diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss
index 9a4d510b7..0a1febaff 100644
--- a/netbox/project-static/styles/_variables.scss
+++ b/netbox/project-static/styles/_variables.scss
@@ -30,6 +30,13 @@ $rich-black-lightest: #1A2C39;
 $bright-teal: #00F2D4;
 $dark-teal: #00857D;
 
+$cyan: #00D8FF;
+$green: #5cff5c;
+$orange: #ff7926;
+$purple: #f540db;
+$red: #ff4646;
+$yellow: #ffc034;
+
 $primary: $dark-teal;
 
 // Navbar active dropdown border color
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
index 120f37990..553134f17 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,42 @@ 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);
+  }
+}
+
+// Change text color based on button color
+@each $color, $value in $theme-colors {
+  .btn-#{$color} {
+    @if $color == 'primary'{
+      --#{$prefix}btn-color: var(--#{$prefix}#{$color}-fg);
+      --#{$prefix}btn-hover-color: var(--#{$prefix}#{$color}-fg);
+      --#{$prefix}btn-active-color: var(--#{$prefix}#{$color}-fg);
+    } @else {
+      --#{$prefix}btn-color: inherit;
+      --#{$prefix}btn-hover-color: $gray-800;
+      --#{$prefix}btn-active-color: $gray-800;
+    }
+  }
+}
+
+// Adjust text color for new green
+.text-bg-green,.text-bg-success,.progress-bar {
+  color: $rich-black!important;
+}
+
 // Dark mode overrides
 body[data-bs-theme=dark] {
 
@@ -86,17 +128,25 @@ body[data-bs-theme=dark] {
   table {
     a {
       color: $bright-teal;
+
+      &.dropdown-item {
+        color: inherit;
+      }
     }
     .badge a {
       color: inherit;
     }
     .btn {
-      color: var(--#{$prefix}body-color);
+      // color: var(--#{$prefix}body-color);
+      color: $rich-black;
     }
   }
 
   // Adjusting text colors
   .text- {
+    &bg-primary {
+      color: $rich-black!important;
+    }
     &muted {
       color: var(--#{$prefix}secondary-color) !important;
     }