diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 0696d2e82..36ed4defc 100644 Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 8ccadc4b5..f4d0311ab 100644 Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 70e79f778..c5cd1a402 100644 Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ diff --git a/netbox/project-static/src/appliedFilter.ts b/netbox/project-static/src/appliedFilter.ts deleted file mode 100644 index 099351ff1..000000000 --- a/netbox/project-static/src/appliedFilter.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { isTruthy } from './util'; - -/** - * Initialize the applied filter display. - * - */ -export function initAppliedFilter(): void { - const appliedFilter = document.getElementById('appliedfilters'); - if (isTruthy(appliedFilter)) { - const divResults = document.getElementById('results'); - if (isTruthy(divResults)) { - const savedFilterSelect = divResults.getElementsByTagName('select')[0]; - if (savedFilterSelect.selectedOptions.length > 0) { - appliedFilter.hidden = true; - } - } - } -} diff --git a/netbox/project-static/src/netbox.ts b/netbox/project-static/src/netbox.ts index c9d5e5a5f..ce0aad93f 100644 --- a/netbox/project-static/src/netbox.ts +++ b/netbox/project-static/src/netbox.ts @@ -14,7 +14,6 @@ import { initDashboard } from './dashboard'; import { initRackElevation } from './racks'; import { initHtmx } from './htmx'; import { initSavedFilterSelect } from './forms/savedFiltersSelect'; -import { initAppliedFilter } from './appliedFilter'; function initDocument(): void { for (const init of [ @@ -34,7 +33,6 @@ function initDocument(): void { initRackElevation, initHtmx, initSavedFilterSelect, - initAppliedFilter, ]) { init(); } diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index b04b85fc9..af2905312 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -7,6 +7,7 @@ // Overrides of external libraries @import 'overrides/bootstrap'; @import 'overrides/tabler'; +@import 'overrides/tomselect'; // Transitional styling to ease migration of templates from NetBox v3.x @import 'transitional/badges'; diff --git a/netbox/project-static/styles/overrides/_tomselect.scss b/netbox/project-static/styles/overrides/_tomselect.scss new file mode 100644 index 000000000..29aa9d361 --- /dev/null +++ b/netbox/project-static/styles/overrides/_tomselect.scss @@ -0,0 +1,8 @@ +.ts-wrapper.multi { + .ts-control { + padding: 7px 7px 3px 7px; + div { + margin: 0 4px 4px 0; + } + } +} diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html index 9bd4b93c9..ec913d32a 100644 --- a/netbox/templates/inc/table_controls_htmx.html +++ b/netbox/templates/inc/table_controls_htmx.html @@ -4,9 +4,8 @@
- + @@ -15,11 +14,12 @@
- -
- -
- {{ filter_form.filter_id }} +
+
+ +
+ {{ filter_form.filter_id }} +