From d61387a7ccf333f0af1b95a6cff2644774b2b06b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 16 Jul 2024 14:21:40 -0400 Subject: [PATCH] Revert custom button colors --- netbox/project-static/dist/netbox.css | Bin 555394 -> 554686 bytes netbox/project-static/styles/_variables.scss | 7 ----- .../styles/overrides/_tabler.scss | 29 +----------------- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index c9fb7c49b617e10d07eed833234056513af1c2b3..fc7f3ca9df0fc34314c4868995c5315fd2774a23 100644 GIT binary patch delta 3518 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 delta 4182 zcmahMYiv{3S-!ci*c8afJ2)gGO+eV-`?PNox>SR(!I;`=KgKo&_h}4{?OZ$1l%bS% z8v?Wjbf%s%wcY4w109rrHQfp{C_mawtb?MBjy?uRgQ-Xh47J+U{$c0db8m1Gs{Od~ z`Ofz~-_vI%+MoHfef(&MmUPRKbokg983h+Zk@;3q;pLuqyrgCAxS{6Krrq7P(6U5X zl;OY;vK7=4TWL!Y6NU!%5er3(3OMq%%i?iV3K}-E+59%|T2BZf{Cu2@&Q9B=nL~Hj z1n`xr4my!ok?QX+_g0+_MHD{P#!FJHP2r(AMs|Wl)a-~0b37Mo6H=g$stdbtGU0w; z19g5DFCthL5hJGniB44F^K{*k3iiNaY+Bq-Yu#8K=PH(XIQshsxvdrn64z5?fPMMZvm|!&AOIfC9 zh~T~Oe9AIZLj`xk$7l_qH4~g@ih^^IF51!+HP!R{M5ra~J)I_LQV-mJC)8Yy&q`3V zW$}jG1Gs1B!DR;ss=U4C0>R+d>;W|&w7OgY7`oYng}8z20im0<;CSsEB*F`9&1Pz4 zxw@`E(28MMih-P1L0PJmG&~2;RYFN12Ufsfn%#+7b*^ccs-MA&Y1;WpKLaOIbjf zrXlNKaMuv{)6Zl-o=5GQ8c-ZUK+nt_K(X!Irx}QmcH5^1-XCs{J4$>Q!+2*Vygl z@lRspw9CS?2PT{Y6QRRbVb=wMhrhcze~(xFed(Qq8?*LE)&hp zvcC}bA`y<4Vs0&>UpUBCtq51Zmu?U#=k#^r34-MlVoXWK1Q;T#R@{dMKO+?Q!rzG- z-jyWBBzTwh2|Q^3T|{v9CP6u~ZxUv8wSq{v7?;G#DnL(H=nm0~bt?YyqpiSqUn3X5w~mkx!OveKYiLO@ zWl4Z@$H;ohvQVnRC1YfBMDhC~FDP!`K0|pu8?;gNmF*D1e9-H*sdg@t zOUJV%ub)`Fsmw%Gv_f8Vd$1q`MAPQMv4wJpKDGQch!DUCty2X}hn8s9Qq`Ojq zkaQI!9W+^%kezs}1Pp~CyO1?~>Wan=&m1FrDZ>y{9o{>J-o`X_ON09hRKr6&3M3Nf zwPg;?rzrgX8{~^$ojRm!)2Ofkj}O>%oRp*3_`m>{&VMS`k>>}g+753bA&Wh;1Hx%j z51>)g_<&L4kwNt+3i6%f_sY7 zgSV#92I-)fS`Yl!UzyrDlPcX@6C`(DpYE8N#1Ec~@X84?3V(H$oD)OC9W4;{7Chs< zR1WlFUQaFR*KT5SC&|VsiT$0E6^r_gy9R*Xs&?m(W%8L*U6!B<$v{m|xaKh_HxC!DWt|MLoc6GPSwA@cK?@@V6 z5K)uxQfC$>mfRhRgFhdn)==I9x)H7qS3DPKQ>!~ zXPgaJnTs2JLGH@rpq1%PAUW8f_JH#fC0OWVMd#Mn*$shAg!UG)h;yx<&CR%l=yp!P z8FRpDcC2pJQmvGW7wpV{Y7fJ6XQ)kGlPy#=2JhDxS^k6L!f#3%KsA=^J@az-XS z;)}*}7t^35@I|0uh_7&)z-QbA@EN75FU@Q3__AcGS$uM<8=ovyH?@4;ms{GFDV0nc zp+?X{WsyG9$oQ1$d_JA^g%0P3N<*3tY(=_!YYjW2X<9&)&XhI{X;@DthiWlxs{Tv4p{`fnUWUzOb6I8GVau2(m-Vl(Zpzi;0P0XoPMCi|5XPdzRBR)g4Iaa6FYr z!1kA^<{wUis5;CiOK~k7_g^3Y{izXKTCnp7g;qaJbrt!9ZED3iQ*ka9)EvB^u^b%u zUZ~m0Ze%Ayq3!U>Mz#w+t+KQ;tg&S>64YivO#}7pJn+`VHfM916{~|%C=}Rwc&flQ z`*{yPEU@bWq%z3z!TsPMI~3gi6P^8vwroU#$3J}8W;gm8d3i_4hL0E7sMA?wU#R*Y D#a15P diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss index 23ae3d544..bf73f8361 100644 --- a/netbox/project-static/styles/_variables.scss +++ b/netbox/project-static/styles/_variables.scss @@ -30,13 +30,6 @@ $rich-black-lightest: #1A2C39; $bright-teal: #00F2D4; $dark-teal: #00857D; -$cyan: #00D8FF; -$green: #5cff5c; -$orange: #ff7926; -$purple: #f540db; -$red: #ff4646; -$yellow: #ffc034; - $primary: $dark-teal; // Navbar active dropdown border color diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss index 3514cc9a0..a0f5fd2b7 100644 --- a/netbox/project-static/styles/overrides/_tabler.scss +++ b/netbox/project-static/styles/overrides/_tabler.scss @@ -92,31 +92,6 @@ table th.orderable a { } } -// Change text color based on button color -@each $color, $value in $theme-colors { - .btn-#{$color} { - @if $color == 'primary'{ - --#{$prefix}btn-color: var(--#{$prefix}#{$color}-fg); - --#{$prefix}btn-hover-color: var(--#{$prefix}#{$color}-fg); - --#{$prefix}btn-active-color: var(--#{$prefix}#{$color}-fg); - } @else { - --#{$prefix}btn-color: inherit; - --#{$prefix}btn-hover-color: $gray-800; - --#{$prefix}btn-active-color: $gray-800; - } - } -} - -// Adjust text color for new green -.text-bg-green,.text-bg-success,.progress-bar { - color: $rich-black!important; -} -.bg-green { - a, i, span { - color: $rich-black!important; - } -} - // Dark mode overrides body[data-bs-theme=dark] { @@ -133,7 +108,6 @@ body[data-bs-theme=dark] { table { a { color: $bright-teal; - &.dropdown-item { color: inherit; } @@ -142,8 +116,7 @@ body[data-bs-theme=dark] { color: inherit; } .btn { - // color: var(--#{$prefix}body-color); - color: $rich-black; + color: var(--#{$prefix}body-color); } // Stops table headers from appearing as primary link color th.orderable a {