From 8dcf9306bfd958fbc2c16c8614d64e6cd0b9afcb Mon Sep 17 00:00:00 2001 From: Andrew Gormley Date: Thu, 27 Jun 2024 13:35:47 +0100 Subject: [PATCH] Revert "fixes #16647: navigation contrast issues" --- netbox/project-static/dist/netbox.css | Bin 552478 -> 551692 bytes netbox/project-static/styles/_variables.scss | 10 ---- .../styles/overrides/_tabler.scss | 48 +----------------- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 93dcad1d3ef425b6c332a3b212d553721111dad5..0ec53a6d27390befa166d8e074df6917b0c345ef 100644 GIT binary patch delta 849 zcmZuvT}TvB6z1;UnLC#2uC3|1{w^wMY3|Pcxa*n(5kV2;OGM?v%+74BxtiYkL1%jkk3ee2xbsUj3!7K!8Yv^_F_&HJz^0022j4XBgKF?MNyR?Ob;MCRn~ps zWLc4eaPNaox2?a4p&?3A=_ZR6_Nj!>UxGk)TSV+}`@OWo;vl}N@g++d^q$plmV6mB8PEnWi>Opjh zI-hUS^>w6552DLW=Pbn#eSuT8jGU_tI59o#KbOZ#e%T-L)485p&aHS0EzYTk5LbfF((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;-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!Ol>-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;)iH+-gF9nPfP>S(pr*Ci(LrhCT8ltXIW zQ+};paS7X9LhT25Q8)9(|BIv99qkfh|%%&JhG_%_V zF&@c#X7oadYV7(6H36cOEK+o1OS?h94u)y0vtho-HZRDn@TL4wlU@NGN;GEp{t0z{ NmpD+EKBqpB{sD>zX?g$v diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss index ef40b1810..afd4bc6bd 100644 --- a/netbox/project-static/styles/_variables.scss +++ b/netbox/project-static/styles/_variables.scss @@ -21,13 +21,3 @@ $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 27d9d4a6a..5ea63be76 100644 --- a/netbox/project-static/styles/overrides/_tabler.scss +++ b/netbox/project-static/styles/overrides/_tabler.scss @@ -36,50 +36,6 @@ pre { } table a { - 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}; - } + // Adjust table anchor link contrast as not enough contrast in dark mode + filter: brightness(110%); }