From 64039a88333d207d1ab3a3abc02c49d6da57a780 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 9 Feb 2024 14:51:21 -0500 Subject: [PATCH] #14917: Remove obsolete slim-select styling --- netbox/project-static/dist/netbox.css | Bin 562677 -> 552405 bytes netbox/project-static/styles/netbox.scss | 1 - .../styles/overrides/_slim-select.scss | 195 ------------------ 3 files changed, 196 deletions(-) delete mode 100644 netbox/project-static/styles/overrides/_slim-select.scss diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 48a70fd10d1258b7a61784d72115642b026672ef..e016f09234cf31288e44984ebd3d0752ee6ccc35 100644 GIT binary patch delta 119 zcmeymTIuR-#fBEf7N!>F7M2#)7Pc1lEgUj&Oa(>LAMR%so_^pU6ZiHXtsH$k;>szB zDQT&u)=BwADXB%eMTseyrNvez(+wtbNN>MCiKB>75{Ht4is=)la5OQS02w+{IZgrq Dcq1%C delta 7260 zcmbtZYit}>71sK(GqKaiVb`yE?VZ@9_NE?Z){n%VZK|{&Q7CN_A`n$@%Iwapcaqte z^~`MIWHIX?OZ+Jf(Wp663M3Vxtpq}?KvXD#CK6JcAB02@i3%YUsS@fh2&hUcAGpvV|?nyR-Lx=iKi+?m1`g{$={@19Lz^7Wtlr_~^D~W7&g=Z#2LCi}FnMMl>+G$C* zS8?3Jyl|lDDp|V98`(RzgDH-tEYUb?9y%Y~1X8Xo_nol9_R>3-281 z=!Z8Go!wp75Ku~V#^E<(olDh>DXrlH$SW$ZNO{wtIwvT(DZG?nnK`bsmdaqt*n%Xl z6ihyi=w{DI*;BH~`V7vinu^@3sGV!{)Tn=0Hh9ll$mT5`2icj~2X8*pvBx=t?PEgO z)V6_unMF<~WEDxQ*g-NOO8B=82;L{zK2E$A-u(rY0FICJ!R=$+-Bn2yGuVrHj!83E zsZ3GOS7a5vcYHOE(jX#`ka>`6XGNbptaCvYB`;bqN-HUsbR>=8n1&pG*2_MP z;YIC?T7g&Nk-=#fjco{5EGwq$fx*!~Mn_|a@NgQlesEP+rQs@_x@qeYR z@i22iW$H86m)d2ndH^>}2uy_>icy5{ASw)VCuLAOT>i`6+hKk}!kxZ$w zeGPk><<_azifuKu29H$J*nm6u?%PPxJK(*G(L|L5ei{Wn&YsP(X)w5&ViPeg_g=`8 z3(~#(=8<d_P>fh%1?m<u{A zoN|t&Rzp4~@oAKGydnXIt&bNEt-2PwdvT zse0;coB5hjZisqU8ct%E*i;>uXThgE+$B9<#HspHR-#W9pr|=}gOW&kM z;hAgEUQ|_{f6z60!U4yKZuFs-xX$8P6uB8wEAi<6w$6pUBByJHL2jnu9{kqss;t$U zu_0FuNArYWE=g>vz$? zZU$*+lko()tDTU?m$euETqYFb&rfkFav(=5;>D=&t-x=0Q3J4ep4w?AnCGX`frW%e zLlX2{f!v@nzCqnQXBSR>T;Fmm0#`-Tgd3ZT1|KuBT0-IE7zG>LIgs^2s(-8rwzCQD zy%>#K^yJ>J*rgrL@T9c!^DV1x#e=XNF}QjTox(K?x0Q>3EYPzcwuALLB$M zxlTP-C&#r|9E5gx=y)t~9Yr?GN>NyId!AVi84@y2cT7}6Ca4pDw-OB0hOg*axfFQA zDgtWdDz0N6z!?tvNa)bbQLABCbkPLhFeLt)MQOP?jEiFH;}oyNSV7~|A*AZgR|mn9 z`9#G^evnvf<|TfV@Ch&>@L`-{#_ObqwxK>S@{_LqueDoeYgCsYLTGj(St+1)xL~5L z5Fg;!77u{;dbL`80UM~fVD-lxu`l4rZmTz%FHHHNQ}~TD-*M(F8>vVf`cBZj*55CG zrs}Ah7TQ7Ehi%kLhU38XUt}io(oWJSTwiUSX z=dRI3EYj-|LIWUT8}GwlO>Avk9=4vml|&;$8p=IX68csVlK}X33CKdlur|#1N|N0z}E%2B5D$xZ6RIk&efgC;2{Ra#ywPj%h6=(6WXW< zh_uB1?ijbPHJz}mh6>@W(|A7M--|kHr-!$D1?12=8r*&kk4oX_i`0m9`{f;hf;Nop z4WGzCMX6*KyppWJ)FL!sz+(kJ!sGiIoFq{jAJ%bOv4l%QiJB$r%?NuIskrs?-%~qS zolIh84npKtRIEzoiLG`va{w<3ZkrMXw%`zo*EF1N$CGX(5@5FH-yP1T*mf#%#PSiRY~0RQ|}gocfakukXb zNwn`N_o%G2KEynVLOtlc^+*LOBb<`7N>%R{k z`Fy=NcL=|AS(o06OhWY!ox>qw9^D2pXbk=EiLz=)=9Z7>I)U4=&&;*n3UB?XE56?j z3eM?V>e`errFc_pzr&^{X|cVe7<{-uB@?YEAlO5!Stu8?m7rdzUc}xoN6dqIfUJPN ze?a|_qO>rJ(`BrF+!A`vSrgm6_y%l78d3dA1}SvY#xI zdoY3S=}~L?wO%kMsmb}adfF{W0LSWk22UF(YvF6g~L% ae@@bRq`}9-@Lh%e4*t?+1a=kacmD_Onm9cG diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index 0fece199b..3afaaa9fc 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -5,7 +5,6 @@ @import '../node_modules/@tabler/core/src/scss/vendor/tom-select'; // Overrides of external libraries -@import 'overrides/slim-select'; @import 'overrides/tabler'; // Transitional styling to ease migration of templates from NetBox v3.x diff --git a/netbox/project-static/styles/overrides/_slim-select.scss b/netbox/project-static/styles/overrides/_slim-select.scss deleted file mode 100644 index e9f079d44..000000000 --- a/netbox/project-static/styles/overrides/_slim-select.scss +++ /dev/null @@ -1,195 +0,0 @@ -// SlimSelect Style Overrides. - -$height: $input-height; -$white: $white; -$font-color: $input-color; -$font-placeholder-color: $input-placeholder-color; -$font-disabled-color: $form-select-disabled-color; -$primary-color: $primary; -$border-color: $form-select-border-color; -$search-highlight-color: $yellow; -$border-radius: $form-select-border-radius; -$spacing-l: $input-padding-x; -$spacing-m: $input-padding-x; -$spacing-s: $input-padding-x; - -:root { - // Light Mode Variables. - --nbx-select-content-bg: #{$form-select-bg}; - --nbx-select-option-selected-bg: #{$gray-300}; - --nbx-select-option-hover-bg: #{$blue}; - --nbx-select-option-hover-color: #{$white}; - --nbx-select-placeholder-color: #{$gray-500}; - --nbx-select-value-color: #{$white}; - &[data-netbox-color-mode='dark'] { - // Dark Mode Variables. - --nbx-select-content-bg: #{$gray-900}; - --nbx-select-option-selected-bg: #{$gray-500}; - --nbx-select-option-hover-bg: #{$blue-200}; - --nbx-select-option-hover-color: #{color-contrast($blue-200)}; - --nbx-select-placeholder-color: #{$gray-700}; - --nbx-select-value-color: #{$black}; - } -} - -@import '../node_modules/slim-select/src/slim-select/slimselect'; - -.ss-main { - color: $form-select-color; - - .ss-single-selected, - .ss-multi-selected { - padding: $form-select-padding-y $input-padding-x $form-select-padding-y $form-select-padding-x; - background-color: $form-select-bg; - border: $form-select-border-width solid $input-border-color; - &[disabled] { - color: $form-select-disabled-color; - background-color: $form-select-disabled-bg; - border-color: $form-select-disabled-border-color; - } - } - - div.ss-multi-selected .ss-values .ss-disabled, - div.ss-single-selected span.placeholder .ss-disabled { - color: var(--nbx-select-placeholder-color); - } - - .ss-single-selected { - span.ss-arrow { - // Inherit the arrow color from the parent (see color selector). - span.arrow-down, - span.arrow-up { - border-color: currentColor; - color: $text-muted; - } - } - // Don't show the depth indicator outside of the menu. - .placeholder .depth { - display: none; - } - span.placeholder > *, - span.placeholder { - line-height: $input-line-height; - } - } - - .ss-multi-selected { - align-items: center; - padding-right: $input-padding-x; - padding-left: $input-padding-x; - - .ss-values { - .ss-disabled { - padding: 4px 0; - } - .ss-value { - color: var(--nbx-select-value-color); - border-radius: $badge-border-radius; - - // Don't show the depth indicator outside of the menu. - .depth { - display: none; - } - } - } - .ss-add { - margin: 0 0.75rem; - } - } - - .ss-content { - background-color: var(--nbx-select-content-bg); - .ss-list { - .ss-option { - &.ss-option-selected { - color: $body-color; - background-color: var(--nbx-select-option-selected-bg); - } - - &:hover { - color: var(--nbx-select-option-hover-color); - background-color: var(--nbx-select-option-hover-bg); - } - - &:last-child { - border-bottom-right-radius: $form-select-border-radius; - border-bottom-left-radius: $form-select-border-radius; - } - - &.ss-disabled { - background-color: unset; - &:hover { - color: $form-select-disabled-color; - } - } - - .depth { - // Lighten the dash prefix on nested options. - opacity: 0.3; - } - } - - &::-webkit-scrollbar { - right: 0; - width: 4px; - &:hover { - opacity: 0.8; - } - } - - &::-webkit-scrollbar-track { - background: transparent; - } - - &::-webkit-scrollbar-thumb { - right: 0; - width: 2px; - background-color: var(--nbx-sidebar-scroll); - } - } - border-bottom-right-radius: $form-select-border-radius; - border-bottom-left-radius: $form-select-border-radius; - .ss-search { - padding-right: $spacer * 0.5; - - button { - margin-left: $spacer * 0.75; - } - - input[type='search'] { - color: $input-color; - background-color: $form-select-bg; - border: $input-border-width solid $input-border-color; - &:focus { - border-color: $form-select-focus-border-color; - outline: 0; - @if $enable-shadows { - @include box-shadow($form-select-box-shadow, $form-select-focus-box-shadow); - } @else { - // Avoid using mixin so we can pass custom focus shadow properly - box-shadow: $form-select-focus-box-shadow; - } - } - } - } - } -} - -// Fix slim-select 1.x placeholder styling -.ss-main { - .ss-single-selected { - .placeholder { - cursor: pointer; - opacity: 1; - background-color: transparent !important; - } - } -} - -// Apply red border for fields inside a row with .has-errors -.has-errors { - .ss-single-selected, - .ss-multi-selected { - border-color: $red; - } -}