From 347336ba07263665328db72a79903135ba237fab Mon Sep 17 00:00:00 2001 From: Andrew Gormley Date: Thu, 27 Jun 2024 14:01:35 +0100 Subject: [PATCH] fixes #16647: navigation contrast issues updated --- netbox/project-static/dist/netbox.css | Bin 551938 -> 552724 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 36ed4defca8e8ed69115468fac126f7bbb72ce1d..6db226cf81ef22e10e50a57e263dbc9008e714c6 100644 GIT binary patch delta 1150 zcmZWoTWB0r80PGpnKRoaChex%*)6+dDHXBJGS}V7rd<-Pk_V9ul~QYCd*+g6+cX=u zn|O(lVrueG5%fq7C5Q%-S}$N>9tI>>e9^biJO}}cL?j4WEMCBufSx_GDT;6ZH~)9O z?>qm0=Jk!-yWi(-y$Yah6^{p3KtYIWhH<1@)2%+5TN1mdumY9fXJ|puunfI#;YW}S z9*f5S^ozbla>;#Uc-NoM^<9U71YP|Bv;~dbHy~FeZ>N>rDwAtzlK##TEZ~AkCejL7 zOG~_|78pZSgBzWvB+)52TI7=3F95;OdRr!O@`UmWv{dt7Mki7!0GlV6UIx0Bt1-tc zvUMg{EVfMAq~0RKy}@RB{X!I5o6kttc2&k-e=A9TeM1&J&t-L4aJJ-$yf6SHkLRWYEK)XKJ!7HL&9}Tu{9!5JTN#A@FsATh|7@WN|7=5NMTm=bI z`AnpPS)>Htg&#}M!%X-6)l9JR<+WIZF5XTDPk&V@BTHjZO_L6lWBYzCBHCYjOg_9WtfE~dl;lU-W6^w z!;Y^Z_OZc6d_Ypw=IaSl7sWLo_y%sWQ*pKflP%V=!?sJ}P`+v9QM@R=#vcF$A4#eC z?L{%%UX<>g<|CxfpOE*5!e3J92xo@_2N6m|Hdd>b4)U9LR3)(_{qR|N z`k`?=<=}eHlwWUDT}=0sQQ{HC(oEf$$^W-G)}8n2wF$5G;&@NB;a{4jOTVLJ&;Ljb z|D{IHW#6rhd$|7cbj#UsT*LKfrYfGKTNlI*_@sW^Bv(KeiaIk?I|CGYv?`{XRf6G=&=28S}ewq|g#a z$=27MfT}v8duDVZ6ZP`!UpdbXwkXx{QNLboL==%z$mX`PfWa>M+etYamQKsxw)6dj JiBb8!@DE)zX~O^j delta 864 zcmZuvTS!z<6y?mEd(X9;X3W%ad=4pTY0lhvIOA9Z5kU{gpD<%S?wxxl#~jOXBm^NT zQZp&xM7vVbO3R*<_u~XnVbBZwP(ldo34Ikwgct-p?u;e`{cQGGYwyKAd+pP2?MGhO z@3bTAaZ6sU19^?~yI=;P*l2>35p2~yV-My;(Jcm`w;$zen^O#kQxsJRz<58hQDxaI zC(DW)fLkAQx^?*#3=L6|O4nG@VV6n>{Ur!=n?=NKm(N2xEOz3pEGu-nT-r5DEzkLV zA!$*%D9ebjQ*=yRN^t;!i{z=`Q;-^n~)^2xrCk4|;xaxTTKy7erR9_}gO zWho>p65Z6f5r@J`m`?S@wfWAfl~|G#7c`FhbE{FefsViNL0b!|rrsYG_|${^thW_qo06M>nWN}B47Q+5*cC?+7&?NuB+;c4 zZ04xpKrNhIVLaY7{o25$UmJtZ=y{y08=eK>VeBYyhy0#Ed3juJjFlgZMWRxyt-LX= zuUhr0YS;^38@X&Kx`9{GZj{4*4&$Fsu-6|7CmaDaO48Vx{oGSz^t-}|+B~ow;7m|I zg3YWn%2lmT9vRqcP#(P7P6RMtjZ0(ZizJW_1rsEl1s{>y zdy`$voFjNFOZNOVGM(L6C)mvY!OH?dO@3B5(im4`RdOt{uRh+SwzQNuosQyCxLYS= cz~COC9ps>p%XS2XX%if35X{W6U-)SJ1Eq{B$N&HU 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 97f1298df..3d8b46fe9 100644 --- a/netbox/project-static/styles/overrides/_tabler.scss +++ b/netbox/project-static/styles/overrides/_tabler.scss @@ -36,11 +36,55 @@ pre { } table a { - // Adjust table anchor link contrast as not enough contrast in dark mode - filter: brightness(110%); + color: $dark-teal; } // Override background color alpha value [data-bs-theme=dark] ::selection { background-color: rgba(var(--tblr-primary-rgb),.48) } + +// Side navigation +.navbar-vertical { + background-color: $rich-black; + .dropdown-item { + color: white!important; + } + .text-secondary { + color: $gray-400!important; + } +} + +// Dark mode colors +@if $enable-dark-mode { + @include color-mode(dark, true) { + --#{$prefix}link-color: #{$bright-teal}; + --#{$prefix}secondary: #{$gray-400}; + } +} + +// 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); + } + } +}