From f746ab178d4d505910c16d11bc3cf7aaee4619e0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 29 Dec 2023 19:47:18 -0500
Subject: [PATCH] Tweak navbar size

---
 netbox/project-static/dist/netbox-print.css   | Bin 354322 -> 352529 bytes
 netbox/project-static/dist/netbox.css         | Bin 523723 -> 523723 bytes
 netbox/project-static/styles/_netbox.scss     |   3 +-
 netbox/project-static/styles/variables.scss   |  54 +-----------------
 .../utilities/templates/navigation/menu.html  |   4 +-
 5 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index b8420fd7e8431fc91453b70843b4421916098a8d..d766e5f6e4c9b803dacb524e502242c2dbedd407 100644
GIT binary patch
delta 32
ocmbPqL3H9F(S{br7N!>FEi7!Or|<vG!aChx3p3ktp-U{&0M;)IegFUf

delta 1398
zcmai!&u-H|5XP0(LC}g`N{gTYS*nmgWRcf@VyA%vZ-B%T?0R?8h{TRIZV5taK+1tD
zjbO!rBWHwEQE}zkOJ4vEya5L|Rft`C6W2}<mz6y`Gx_|@Z}R%<#^LG4i*aSVG+sV3
zE}V#)2gc>~4xt!vfZIFfHf_?7vX=Pt!ML&_-x0wcCN1&u*x1_IF?k!K+t3Q?CWO8`
zY_D$KgWjE%`1#qW)nq|43<DOl0EqAq40P+HlXS(m)5<m|#s|BI#7}q3PBfs2Y4wLD
zuswO&+2aJAt&eQkJ*&c;A`<ew9xiCrmoa&kg&AYh0u>A6Zp@`H$90fv>6<>MIyqoX
zhR#Q0PAH#MHN-)!a&e?SCfr3)n*u}#CE5w~`OuL^;7T9dsZgECX)oT-b8V|`dQRPJ
zGz+;1cPWTsvPe*<FP8|NeEhR{U+c`m3FW;`gpy7iE%0M5XYzjSn)nT>+mEFggi@O}
zrtOqNpr<4xal0+$%sg{^gngZ+h8dxK(CtJ|@{G*Yw_l8_k7Qp)d<xxCK_77%CFPQw
z1l6?7<Gp?<MXZbrt3anMfwP-Aoo>^!JU@ePMkka$!-hoE_S94qKPkS^6klHs0R~VV
zY7`3JT#VWTg==m?BlJC=lv4gfu7vn-b#r9RT9?@^(1>U3LJXO0>)%Sl(^0TFP}RC>
z12Xw3)aUUP&uf*{f3ce_aG<>K>;jP)=Oua_=_O1LSC*V(y~J-pk%F+A(k;5R%Jm27
z8l?qu@D>c2gBReKi|-?2OPqn~4MlKaDyc~e31*C-#&o|I60HC66u}P_!7PMU8Tk^y
ex+I5YM)2hBuUi5fEngBp)~c_L-<=r4H-7=_J-TK9

diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index a6c49c83df19d9c0dd0c7842a142354f693507d6..8ed4ecab422a18b0f27de1942b36a6c03a7a8d2d 100644
GIT binary patch
delta 1072
zcmY*YT}V@580H+`cW!Rw(YE=MZu74#Fn7FI4K%m9Ss=6(By|x5QqaX@1YH&qLQqi)
zZSO@0bseD>#wp0Ak%JOaiogoeen7&0CfE;Xv-jKF@pN(Ed*0`JAKv%*o-@7bo?dnL
z4@d*@K*<=~pTgkTQ}Oe(JOwH(tbl{or=S}|k=n;)2c?h6R;@1skIhn$cFn+$fy<7{
zR{H%2wvysRJ0&yFLY`M(*TS>VYu-?vpDQYVn=>do>B0k6KK=&MLb?8<LAfC>n)<@i
z<Tb+qbP#Ly5TBf>T2!@}Pw=+1FiL0%nrL<j5>imx_Z8woZe#_nG3@#Yb0&s$LA*%A
zt!N)qkC^E5u<WJzR&;59*1%Q5ywr(}lv@W2^{9A=Vma{9%u_H^^e-U2SFwdJEjMGe
zpxQ|p2QT@zV-@|7cyFF8O70GHk_YqSMMT|AeLJvUoE)S~!xmD!*kynTFD45x`ws5V
zs8Wz~5W_mk`OvGgbrh?>XaOd}I7GJ*_tL~9oTl<U#WwXd_$i%(M(R&P87179po3-T
zBbyn8C7T|6?=pJu%Z!^ItXa`QVH@5p?#l}8G?8H|LK5z#SVXc4c(kx@G$Ppqw9tAD
z9?)3}osjX$CQLmO5fSSb`z`rW-U7Wu3gE;4ZqyfS&~I>4y~b8Nk&XM%^=dR}BX;c7
zpE6L5W5o@a^^w0@s-&=lfqXs<FP5l5hsMKK8e`(1Sfh~i;F+Ris+o=9a2yttkFp=w
zk=hJcZ@xe`2aU6_vvgx9je~Zz*hh+rWuoyOvkiXSPl-jSD41D{^+tFm0$9b_j^sm5
zCuO`WPEEqN5P8~g8>#hJPHfr@9lA&f;Vt4;KP6uR2*Z3j8y5m?sYT9->f)RTL<?Cs
gr*Uj-63@+{XwyfHci^BDyu?2Pe<n@pEPX!t4+W`P>i_@%

delta 968
zcmZ9K?MqW}6vw&ObLQqGH{0d|xv5LG7dEdiZbgcly)hDU1xdY#0x9UlY6QJ3Duke-
z3~S#P;a?D;FN|A|DUpK^QVPLDay@{A6$bVIn(O!5-R89y7tZ$_exGyh_nfJ<z|>mc
zO25*t_Lq#(<4M*poK9TAk4e&yStT#BlhjQziPkaIi}B;C(>Rx==XOQMu4%ewsjZBt
zPW*mG+u-uC2LowpLj7Cv7_k}Zv**c+a|QCZISbi`%TEOP#5)?7<hqX*azhT9`XZ*u
zF=IM=A(*`okuO!tnlb%}=1a{{qRSM-%rYev-RS&E35gqCrQ1Sw{G>UXkURGBH4HVg
zXHYw8!{;G2gvDm|8-LcxUxKUqIEalbInb-|VZ=8mjOmwTN6%kkyw|u1?ksg8Hb!nE
zs_^Vq<o6CM@|T?p$aN<>5G&`0@_7vom2oR3(t;}(yAkhFoKhY`ppAX#=~Bw2bRb*9
z2Z~h(PO5x!Q>I=?w?o|VUn&{mfz1?L#7{S+cvOdtFo(9LjJTU$s8)M$r<!fXu!sBd
zuISY~YECaIVYGBBm53><=hiG&(qm4atYNPq2CuYQ<3+qt;_CUViA(Jih6s<3$U+z^
zAA}dRX>#6w%>lTBydSQ4a+~&K7RY01u(&{S@m&ykFHWg^Lq?5;u%e9fzhH<B-^vf}
z(zr~vdL+5EgXa(0F`{t;l1qgKg`>*<!Gz9Lxd!sY%myL~O0T1+kMMSAbzA}A^WCEK
z!xiNR5Kmh$@P<fw94=N9@>(OQB{~Dm&s8~v%nDsJD)w->BF<BsWh6guqKya5L(H^u
X&H^1G5^fhfzAmKrY(}QNba~<**$qP|

diff --git a/netbox/project-static/styles/_netbox.scss b/netbox/project-static/styles/_netbox.scss
index 7824d622d..7ca569a95 100644
--- a/netbox/project-static/styles/_netbox.scss
+++ b/netbox/project-static/styles/_netbox.scss
@@ -1,5 +1,4 @@
-// Entry for netbox-light.css stylesheet.
-
+@import 'variables';
 @import '../node_modules/@tabler/core/src/scss/_core.scss';
 //@import './theme-light.scss';
 //@import './select.scss';
diff --git a/netbox/project-static/styles/variables.scss b/netbox/project-static/styles/variables.scss
index 8075cf5b0..547931622 100644
--- a/netbox/project-static/styles/variables.scss
+++ b/netbox/project-static/styles/variables.scss
@@ -1,55 +1,3 @@
 // NetBox CSS Variables
 
-:root {
-  // Light Mode Variables.
-  --nbx-sidebar-bg: #{$gray-200};
-  --nbx-sidebar-scroll: #{$gray-500};
-  --nbx-sidebar-link-hover-bg: #{rgba($gray-600, 0.15)};
-  --nbx-sidebar-link-active-bg: #9cc8f8;
-  --nbx-sidebar-title-color: #{$text-muted};
-  --nbx-sidebar-shadow: inset 0px -25px 20px -25px rgba(0, 0, 0, 0.25);
-  --nbx-breadcrumb-bg: #{$light};
-  --nbx-body-bg: #{$white};
-  --nbx-body-color: #{$gray-800};
-  --nbx-pre-bg: #{$gray-100};
-  --nbx-pre-border-color: #{$gray-600};
-  --nbx-change-added: #{rgba($green, 0.4)};
-  --nbx-change-removed: #{rgba($red, 0.4)};
-  --nbx-cable-node-bg: #{$gray-100};
-  --nbx-cable-node-border-color: #{$gray-200};
-  --nbx-cable-termination-bg: #{$gray-200};
-  --nbx-cable-termination-border-color: #{$gray-300};
-  --nbx-search-filter-border-left-color: #{$gray-300};
-  --nbx-color-mode-toggle-color: #{$primary};
-  --nbx-sidenav-link-color: #{$gray-800};
-  --nbx-sidenav-pin-color: #{$orange};
-  --nbx-sidenav-parent-color: #{$gray-800};
-  --nbx-sidenav-group-color: #{$gray-800};
-
-  &[data-netbox-color-mode='dark'] {
-    // Dark Mode Variables.
-    --nbx-sidebar-bg: #{$gray-900};
-    --nbx-sidebar-scroll: #{$gray-700};
-    --nbx-sidebar-link-active-bg: #{rgba($blue-300, 0.25)};
-    --nbx-sidebar-link-hover-bg: #{rgba($gray-500, 0.15)};
-    --nbx-sidebar-title-color: #{$gray-600};
-    --nbx-sidebar-shadow: inset 0px -25px 20px -25px rgba(255, 255, 255, 0.05);
-    --nbx-breadcrumb-bg: #{$gray-800};
-    --nbx-body-bg: #{$darker};
-    --nbx-body-color: #{$gray-100};
-    --nbx-pre-bg: #{$gray-700};
-    --nbx-pre-border-color: #{$gray-600};
-    --nbx-change-added: #{rgba($green-300, 0.4)};
-    --nbx-change-removed: #{rgba($red-300, 0.4)};
-    --nbx-cable-node-bg: #{$gray-700};
-    --nbx-cable-node-border-color: #{$gray-600};
-    --nbx-cable-termination-bg: #{$gray-800};
-    --nbx-cable-termination-border-color: #{$gray-700};
-    --nbx-search-filter-border-left-color: #{$gray-600};
-    --nbx-color-mode-toggle-color: #{$yellow-300};
-    --nbx-sidenav-link-color: #{$gray-200};
-    --nbx-sidenav-pin-color: #{$yellow};
-    --nbx-sidenav-parent-color: #{$gray-200};
-    --nbx-sidenav-group-color: #{$gray-600};
-  }
-}
+$sidebar-width: 18rem;
diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html
index c4da0478c..0f00e4a75 100644
--- a/netbox/utilities/templates/navigation/menu.html
+++ b/netbox/utilities/templates/navigation/menu.html
@@ -19,11 +19,11 @@
         <div class="dropdown-menu-columns">
           <div class="dropdown-menu-column">
             {% for group, items in groups %}
-              <div class="hr-text dropdown-item m-0 ps-2">
+              <div class="hr-text dropdown-item m-0 px-2">
                 <span>{{ group.label }}</span>
               </div>
               {% for item, buttons in items %}
-                <a class="dropdown-item ps-2" href="{% url item.link %}">
+                <a class="dropdown-item ps-3" href="{% url item.link %}">
                   {{ item.link_text }}
                 </a>
               {% endfor %}