From 4533c46e3f01f8f7f8c55e9daa72c92d38260a4b Mon Sep 17 00:00:00 2001
From: Andrew Gormley <Andrew@MacBook-Pro-3.local>
Date: Tue, 25 Jun 2024 17:09:15 +0100
Subject: [PATCH] fixes #16647: navigation contrast issues

---
 netbox/project-static/dist/netbox.css         | Bin 551692 -> 552478 bytes
 netbox/project-static/styles/_variables.scss  |  10 ++++
 .../styles/overrides/_tabler.scss             |  48 +++++++++++++++++-
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 0ec53a6d27390befa166d8e074df6917b0c345ef..93dcad1d3ef425b6c332a3b212d553721111dad5 100644
GIT binary patch
delta 1151
zcmZ8fU1%It6z1;SnLFF2ByE!I?3P`236^4;cxPv3capSAqE+%BvY|e-wY9zTlXlxA
z8@HRN)JP#Ud1x%?g<eYVCy>-y1q<^qP=ci|`WBiODVT?d1VM`x6?_Tk-8-A2zMb!!
z@1E~F=iK@4av!hf?!E({Z559OS3p6E>xOYCtLLqLmRpoNn6wPF;Adz-*|3a!|BW9(
zCU`y`1JEz}7R@C(>FFJRLf3a44%*qu51=Ke@4N*?NBTiZ+lhI*W=}fM)&~ouVA6?{
zMpsjcDB=QVU>w|PJFdu1!O<g?++GPtj^5i8iPIOgU!aA}e+eB+CIM``;Qi9jwOpMm
zW{{od4U5I5NQ=^2<hVE3NUdFnZ0mDrh1f3U{I%-|`s;hD<asWSONv80(=+Ii*%I_@
z&!%T*J3hR2Huz(<Zx3|yjvweZhgwBM^_%B|&D#gjHcGJhX91=gx8>l>-JvMW-na_d
zY57Z;4P}rPd>?+UK#%agpRA;V<*%>BB6RV7DtP5Vxr8j8TQyBKT#9uD_x^63gpIYc
z-DMS1{8(X=m%x#5U=ldH#N6!B47kI}GvKO#a~y_`W@6RjNatJSOJ!?6#a@VG9!79*
zBWBM%T#tnh*QL|niX$<732N&0iCB3F4oF42$W}+?gyI)QjFCM1Y6)hb$v+0o#yi5z
zCD{56Bt9|tiuWlPH-1l;yeO{%$u~%Yos9DvnEbGo9kz_g!#xctkC6rWUGV`J_)JO8
zZ7s;*)`If*q*x(){g}Epl>Sos4heQR*o9Cs3ST~q!2ZbYu!GW1?S_*MnktDx_~cXc
zYDUo6;)<k&XYQlr*P@cTPqo^FNH};<oql>iH+-gF9nPfP>S(pr*Ci(LrhCT8ltXIW
zQ+};paS7X9LhT25Q8)9(|BIv99<NrN@TzZ)cUS8E*k!i(J4)F9?Z8QO|E+rWCEu-%
zd!+XE<))zHxQ6THDq|DXTAhs7r<r~VXzXxBPBo%-I`D<U@F|c&O-}-}^h}U*e)oBw
zcz%to{ibxv!dl}=QWizQW7t(QEc+Zl?4t_Uqjq6ick)DtBvG9>qkfh|%%&JhG_%_V
zF&@c#X7oadYV7(6H36cOEK+o1OS?h94u)y0vtho-HZRDn@TL4wlU@NGN;GEp{t0z{
NmpD+EKBqpB{sD>zX?g$v

delta 849
zcmZuvT}TvB6z1;UnLC#2uC3|1{w^wMY3|Pcxa*n(5kV2;OGM?v%+74Bxti<xAOuO0
znn?*4I+bF7T9y^&Jlr5s4Eh5fl&F`C?6v5J5QD&Kb~PdB<#6uzo%3<-`OeV1qwkGl
z`~<>YkL1%jkk3ee2xbsUj3!7K!8Yv^_F_&HJz^0022j4XBgKF?MNyR?Ob;MCRn~ps
zWLc4eaPNaox2?a4p&?3A=_ZR6_Nj!>UxGk)TSV+}`@OWo;vl}N@<Nx}t=+a9;JJW5
zB&|vpXBiQ8iLO=UowhHWTl9HWmG@_7Bb=z#HEb!>g++d^q$plmV6mB8PEnWi>Opjh
zI-hUS^>w6552DLW=Pbn#eSuT8jGU_tI59o#KbOZ#e%T-L)485p&aHS<kDg`Hlf9+9
zEQMr6qT9P_aVV^W>0EzYTk5LbfF((BL(7E0K^Hz((%Dg)Hh5_v?O#}%9o<3JpiDTw
z89BB3@x3b;-G0|b??2?V8TN?Bp^)m)&Q6XRk{NB9veSvlmzw=a_cr1TBz_Qp^hJK7
z_V~BC&8XWzr{DRZy%p6^-%ksC>_q|A*M_o9$<4sqPIL#Zw4zMd7e^7edJ1t#qFX1}
z+fGCC0l1iEJk$Mp-oReZ8|$Cb%Q#mzJPX3Z*jeBS1-!wEin!but2iEuM5S1JMPpoF
zwdzyVun)d9a@kNkhBIgn%3;gHc=;*z1w!G3BcMh}I@@%NdxnewcQ{d-2li&p1V=}(
znUzJk>aEEm14kXogZF!g0Oni#1{fOPc5#W@2*QI4yuBL_atsgh9}gy1$i6S}b>%CK
zbFYw<9V{Y?wv~5FkQB054f#+4l`3(u(=v(HLgYG0g&XZ$Ix}A*!F(u~Ay!sDMeZL;
zb}@5~;I*vT^Vdi#8`~n-&Hus6gF;<?RyfiaS7X(3EOO*%yh&|sEp@q^C1vc&VWH2o
LB3#)Zd^P?7Wuzt(

diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss
index afd4bc6bd..ef40b1810 100644
--- a/netbox/project-static/styles/_variables.scss
+++ b/netbox/project-static/styles/_variables.scss
@@ -21,3 +21,13 @@ $hover-bg: rgba(var(--tblr-secondary-rgb), 0.08);
 
 // Ensure active nav-pill has a background color in dark mode
 $nav-pills-link-active-bg: rgba(var(--tblr-secondary-rgb), 0.15);
+
+// Colors
+$rich-black: #001423;
+$rich-black-light: #081B2A;
+$rich-black-lighter: #0D202E;
+$rich-black-lightest: #1A2C39;
+$bright-teal: #00F2D4;
+$dark-teal: #00857D;
+
+$primary: $dark-teal;
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
index 5ea63be76..27d9d4a6a 100644
--- a/netbox/project-static/styles/overrides/_tabler.scss
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -36,6 +36,50 @@ pre {
 }
 
 table a {
-  // Adjust table anchor link contrast as not enough contrast in dark mode
-  filter: brightness(110%);
+  color: $dark-teal;
+}
+
+// Side navigation
+.navbar-vertical {
+  background-color: $rich-black;
+  .dropdown-item {
+    color: white!important;
+  }
+  .text-secondary {
+    color: $gray-400!important;
+  }
+}
+
+// Dark mode overrides
+body[data-bs-theme=dark] {
+
+  // Background colors to match brand colors
+  background-color: $rich-black;
+  .navbar, .page-header {
+    background-color: $rich-black;
+  }
+  .page, .page-tabs .nav-tabs .nav-link.active {
+    background-color: $rich-black-light;
+  }
+
+  // Adjust dark table link color without affecting buttons and badges
+  table {
+    a {
+      color: $bright-teal;
+    }
+    .badge a {
+      color: inherit;
+    }
+    .btn {
+      color: var(--#{$prefix}body-color);
+    }
+  }
+}
+
+// Dark mode colors
+@if $enable-dark-mode {
+  @include color-mode(dark, true) {
+    --#{$prefix}link-color: #{$bright-teal};
+    --#{$prefix}secondary: #{$gray-400};
+  }
 }