From c93413dc9c14a76d70e55b39b44ce60ca6940623 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Tue, 23 Jan 2024 21:33:09 +0100
Subject: [PATCH] Move interface colour logic into SCSS where it belongs

---
 netbox/project-static/dist/netbox-dark.css   | Bin 377206 -> 376700 bytes
 netbox/project-static/dist/netbox-light.css  | Bin 234355 -> 233635 bytes
 netbox/project-static/dist/netbox-print.css  | Bin 729540 -> 730610 bytes
 netbox/project-static/styles/netbox.scss     |  48 +++++++++++++++----
 netbox/templates/dcim/device/interfaces.html |  30 ------------
 5 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 3032fe467ea47d59c64340686dd42ea368d0ac99..78799839ed87a890969704f64cd09995c0e0962c 100644
GIT binary patch
delta 599
zcmey?B>v~0SVIeA3sVbo3(FSPjVrfpU@aA#{{9i8()6?YS)~k9Qp+-vQ{yx9N>Yo`
z5|dMlV--q@qEiw}5_OXklX6mZi%SwqN{eli^YijjlS@)lCU00SGW~!!BinSwzl^G2
zLkx&Dq#!2|Xi7@#^of<sk_i14#OhB;P0r8F%`7g?%+JfrOOKuYaS^NZbmqT|%3ycs
z;V~ySu_#*??g`tHqS90>KGDEqLRn@}NoisZSSz{@wDIUm%>#vFifu|}F_;0iRzMv&
z06p+%#~ur@3Q46UCHZ-JV1H%i0b?l#Xvy@4j~ETWVG)hhNUOa35)FK@8>@+8Ff_ud
Pfo=yfD}mbcQfs*YGr8)W

delta 1500
zcmai!O^ee&7{}?_dJqLg=z6S(pwf}dq<QJ?LH!Ei7no#bvcZ^?w59f9M0(%D9&+_0
z>`@T*><5y?izgAEXVS7WCT<~ww14LJy#D9+pW&}hhaWe+&B5lzrvGj5^}N3GqksEN
zTx3N_W@Y-0m+Pa^BVY1R$zwwD=smGS!l`#ODwBvmq0||Vs2`3;%$tly&#Cv+JaP7+
zH$1#LKbLWl3&10xe)hBfuxh~bWgN@-9HItZ6ih>tLAIh5HGrt03onngqmndNg|0v-
z<y$ONOi+dSGX^9!@jFN>Ugl|@08A;teQv?FqQPUH2P6vZpiUP~@H~+v(4e<|sE)}i
zqq~i0(p+dM)vpO;_-}JbmL?~Q`txOf_*#FOM;Y{mG01_rP+{vR4B;)L!A0an!YT?C
z1exQBvZd7hY;6Q8M%X>;0D}=}f}`PX;Hba~+-N4ucPpr$VkHw8c&munvYcg@7@vkx
z*t2Ogi#7$=1YtOzHZ0AtBhnAO$lE1WHJ$*;AnA@$7q>5@9i&nU1Z^j53>X9pbNzIS
zlIK-|<tZ7lfbDY9DWRB{o!9oG0d5}cFd|vYEGt$BYwvNRnW^p8xcbi?C#94*z&hNj
zC4)uj^<G^_o*`)}R7|ZJL8&s6#Gu>St906Bhj`5~CttQ)kBSM}WBR1zcmWD2>o1r6
zyA}R6j<Y@9iZUMKDmjj0)uaD6IN;0XY3<_bBwgsiE4U)a{i_R93y3&7J$+Dre{t}*
QeklewFD}jp#l7CGzmD0!lK=n!

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 22a9c6acf6d1ea1b30db7b831da3a1313083e58f..15d65dc5092022f0196bbadde59e280d4a63fe7e 100644
GIT binary patch
delta 614
zcmeyojBoKmzJ?aY7N#xC3mc~&sAp!Ip4P!Ezx{SQ^K|a%29ubj3{z6eGLuu|GxJJP
zi_#L4Q;TC2N{XUW5=#<wlM|D2Qgw?<5=%;pZIko!@=}vaQd6cEyk-=c{9rj7vyoXX
z*bIGQ%_zu81R4T1L3Hx`QdYPL7Q~v6lA4^Ko10l&oSC1OnU@|r{h~IL$Yh7p2&44y
z7?qn?l&uT*h;2zxX)2~~)bSWlmRVF%nwW#6bHPGHIB4V1nVJU*%oN*{%wjMDV(<M8
z2;E_LbYqW+ScRn0l9K#9J+Qwr^MEmx1GJ+WXa_K)E3NYK^HL!(6phtvpn?(&d{G^%
NiDCmZ`cTd10sx!X>7)Pv

delta 1470
zcmZ{k!H&}~6h+mE*nk+25DRu0u>q+;u^lH(`2{w7f@3?GFd?bjR;6MQMw%7dS<IFZ
z5?_GCijPA40Pn>W*c~HPQI)HlT)%r?zTTex{&xE5YIb$<J-WRdmu46?ACsi7J|uGJ
z29vBz`(Bv+GJeijA*$kaKuiST%h)uPc)`g$CX~Wu!RGNR!e4q1thF3^WqG+Qc%eM`
z;a?q*H=k$G*=TL7w^Hi$8f=hqQSi)r>>xTeC<g}&E{iPSqV4MeNIX+{oq8lx91J`?
z#*_eqW@!Ml6Q*zb23U11N$L;hAUZh8(N+nADFQGh`bHaIDam-o556AT^ILJ6%CD2?
z>3BTYu5HdY@T@Mi)U|h}Npf8<FhE(3mon(XTmXq>Ol1CaAh-()8g1B+GhfW(JT&C0
z+iJk1D%Z82GAfQA0(J<2@lqbDOxvrr!MO6Aq&2li8xQTYq6<s0dw8}C{@m%`YHL;<
z+RE#UO5)AQYA%aFnR8%Gk@>7?HQF8rrE<m=ej!(&IH0LP(`K-cDWer)+|+I8ARy%i
z6MuA+`1RY_lkwl04hGxfz7vN@C{7~O+`aC)VF#}b6xV7VE8N?|ZZ<~i9#DbJoFtC~
zrvAH^8!bBE&{USCze}h%7#t%_$p|nUs~-(~wB%l(p;Sq6wBV>XAnYE+%7pj3F#^AQ
zLRGx-JB&&aVL0=9(b+qjSJerLjYv~}Z>IasTOknpyJLKJ-fpm-b?xu)bblgTzlomx
M_;MNjd@#HJ2TP{4>;M1&

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 3c58d79c006a25c5beea279a242142bc7c8fcde4..bfa625b945cec27013590a409d98935faede0b5f 100644
GIT binary patch
delta 1629
zcmX?dSm)DeorV_17N!>F7M2#)7Pc1l7LFFqEnM@yZx{c^wOV=lc^Phb!<5vr%;ePg
z%)FA+qO`>1)Z$o$lA`F8#F9ka<iw<$RNdl|#FElt+vNPbywv29)RgH9YdKY>E68(8
zk)iit5~J$$eX`tAMkL!CJAI=9x5)JV8BDCqMrO5O*Xt8&N<mH{(D_JiCs`-l<pw0$
z89QC@Kbz<@J7yNRv(1S$A|*9BKQ}kCxHvOEFEcM45%gr60QZIknQn-k9{7n%WO~A1
zHbgY&;xQ{Xu_#*?o_K6aib^Lx6jcSMAJVi<542=d1E(E)affMLDz=29hR4NanMEa~
zi8&}vB~m@YjT*#R0CZgAZ#LoS556+8!IOtF9=)k~piG%!JN<$nrw%w2iB+vO`2h<%
zIQ(>oFh3=;7;F*PeIgvm#-=8wuw3VgM?dy5BUT})w4@|IPY)bDnR&o6C1<+he_(uq
z$`R_AH~C<YI@o(*RB;|KkgI`#04z8vt@85oQXvJ77gn=@3Q9Eam6@@cC;<R2jV4bF
Zf@A|KnmOHZ5fdbj#8A(n=mAm71pozKV^{zH

delta 1494
zcmaKsF>ljA6vvge0h|d5A~Cw^5~R4gJNultjC_s`XW!X17&~$jg$&3YJOL6y9Wo&G
z3$P+FBiQ&dh@~s<*--9ct5Reo{_Fkn{_p+oe*c{Q_&&X?2lYXHSRd8H`d)p%eo$Lq
zM%OpHPj9XBVN_&A`SI7|Di2>f%@1c$rmsY~bp+*ScA11?!s*nejKO2>PVH05pFVS(
z{{>4G6}g0xGyBAkW_%|5WsOM59B6cgT#m@y`8&%xZ5vpwqev~6K%>EY#yykPipbhs
zzPHBJem7|z7f{MQ>Bqz<MMdjj?oDk*@!^pkR~u30X`TQojw4ED2I{W}wCdlG7zZOX
zfB}K4&WxnU6IB9CMlScb0c$m_Gsd7H4kSP5L1k%ju>z6`RHWj{KsB09a)H8JA0K@z
z*xE}#xt=RLb6BWoAP(E-urnX#WtgiVKTepf6<~<;RctOF6%9k79ZJC+Lwg1YIcYA_
z1h?n=l*G)i)@nM7U?QKOHxIt;!>+y!9_guGmy673g+i)*sBU()U+pZ?948}v*PWXQ
zL`7?(iBNMw+)fu2cq)}dPIv7f=$JcqUX++0;KXvKsM$}e=_s5nWnisBXvf-CWm&O7
zSU1?MX29->by6yo1F7erqBP8r)PGJ_N@P&UNE8I-;X+000LRJ*UO_nJj+<yJumd6^
zv3K54x#c_;6AT~2(DWbpq!f6A2^sRx3^6K=k<AC|_(gk3g_(#jAcUCbrg?w+uVMlV
pXg{6CHy7!uS!o;_L2uqSgsX=~<3p(19ovKP*Xx_n=aYjsqd!z_y|(}W

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index b1d4ef5f0..aee9d0bdb 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -835,15 +835,6 @@ table tbody {
   }
 }
 
-// Expose theme colors as variables. (Useful for dynamic styling of choices etc.)
-// Both as opaque colour and translucent (alpha 15%)
-:root {
-  @each $color, $value in $theme-colors {
-    --nbx-color-#{$color}: #{$value};
-    --nbx-color-#{$color}-a15: #{rgba($value, 0.15)};
-  }
-}
-
 // Style objects with statuses/roles within a table. As of implementation, used for IP addresses
 // assigned to interfaces.
 table .table-badge-group {
@@ -1078,4 +1069,41 @@ html {
       display: none;
     }
   }
-}
+  
+  // Apply row colours to interface lists
+  &[data-netbox-url-name='device_interfaces'] {
+    tr[data-cable-status=connected] {
+      background-color: rgba(map.get($theme-colors, "green"), 0.15);
+    }
+  
+    tr[data-cable-status=planned] {
+      background-color: rgba(map.get($theme-colors, "blue"), 0.15);
+    }
+  
+    tr[data-cable-status=decommissioning] {
+      background-color: rgba(map.get($theme-colors, "yellow"), 0.15);
+    }
+  
+    tr[data-mark-connected=true] {
+      background-color: rgba(map.get($theme-colors, "success"), 0.15);
+    }
+  
+    tr[data-virtual=true] {
+      background-color: rgba(map.get($theme-colors, "primary"), 0.15);
+    }
+  
+    tr[data-enabled=disabled] {
+      background-color: rgba(map.get($theme-colors, "danger"), 0.15);
+    }
+  
+    // Only show the correct button depending on the cable status
+    tr[data-cable-status=connected] button.mark-installed {
+      display: none;
+    }
+  
+    tr:not([data-cable-status=connected]) button.mark-planned {
+      display: none;
+    }
+  
+  }
+}
\ No newline at end of file
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 9860d74ef..8b3fe3097 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -30,33 +30,3 @@
         </div>
     {% endif %}
 {% endblock bulk_extra_controls %}
-
-{% block head %}
-    {{ block.super }}
-    <style>
-        tr[data-cable-status=connected] {
-            background-color: var(--nbx-color-green-a15);
-        }
-        tr[data-cable-status=planned] {
-            background-color: var(--nbx-color-blue-a15);
-        }
-        tr[data-cable-status=decommissioning] {
-            background-color: var(--nbx-color-yellow-a15);
-        }
-        tr[data-mark-connected=true] {
-            background-color: var(--nbx-color-success-a15);
-        }
-        tr[data-virtual=true] {
-            background-color: var(--nbx-color-primary-a15);
-        }
-        tr[data-enabled=disabled] {
-            background-color: var(--nbx-color-danger-a15);
-        }
-        tr[data-cable-status=connected] button.mark-installed {
-            display: none;
-        }
-        tr:not([data-cable-status=connected]) button.mark-planned {
-            display: none;
-        }
-    </style>
-{% endblock %}