From 35cff129745adf999548c7f884018b9c06cc716d Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 15 Apr 2024 08:10:40 -0500 Subject: [PATCH] Apply suggestions from Arthur --- netbox/project-static/dist/netbox.css | Bin 552689 -> 552920 bytes .../project-static/styles/custom/_misc.scss | 12 +++++++++--- .../inc/table_header_filter_dropdown.html | 8 ++++---- netbox/utilities/templatetags/form_helpers.py | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index c4b712c863e9d9e4376367697558d196d1a8bb4b..139c3ad1703faf87d4b15d4baeac400104cb6bd9 100644 GIT binary patch delta 239 zcmex(SMkPu#fBEf7N!>F7M2#)7Pc1lEgT>6>h+TIb4qjbbkj0(N>Yoe3-XIIOEUBG ztcpt#OEQzKQ!FGJCc6zxfnNTxz zi&INVGV{`ltJCuHN_2}et5U7>%#2KnQgdtdTu`is8-rwEZfag>b#7vXZh2-(NrsiN cfk8n9nmeW|a&VA000bG#{d8T delta 27 icmca{U-9Ez#fBEf7N!>F7M2#)7Pc1lEgT>67`XtYy$U4& diff --git a/netbox/project-static/styles/custom/_misc.scss b/netbox/project-static/styles/custom/_misc.scss index c8ace4392..5a5f71187 100644 --- a/netbox/project-static/styles/custom/_misc.scss +++ b/netbox/project-static/styles/custom/_misc.scss @@ -36,6 +36,12 @@ span.color-label { } // Override mdi font-size to adjust filter icon size -.btn.dropdown-toggle > .mdi-filter-settings { - font-size: 1.25rem; -} \ No newline at end of file +.column-filter.dropdown > .dropdown-toggle > .mdi-filter-settings { + font-size: .625rem; +} + +.column-filter.dropdown > .dropdown-menu { + max-width: 300px; +} + +.column-filter.dropdown-toggle:after { content: none } \ No newline at end of file diff --git a/netbox/templates/inc/table_header_filter_dropdown.html b/netbox/templates/inc/table_header_filter_dropdown.html index 5242bc4b6..03b94cc7a 100644 --- a/netbox/templates/inc/table_header_filter_dropdown.html +++ b/netbox/templates/inc/table_header_filter_dropdown.html @@ -1,11 +1,11 @@ {% load form_helpers %} {% if form_field %} {% endif %} \ No newline at end of file diff --git a/netbox/utilities/templatetags/form_helpers.py b/netbox/utilities/templatetags/form_helpers.py index 31d24b026..9245d7cc8 100644 --- a/netbox/utilities/templatetags/form_helpers.py +++ b/netbox/utilities/templatetags/form_helpers.py @@ -151,8 +151,8 @@ def render_table_filter_field(field, table, request): url = table.htmx_url + querystring(request, **kwargs) elif request: url = querystring(request, **kwargs) - # Set HTMX args + # Set HTMX args if hasattr(field.field, 'widget'): field.field.widget.attrs.update({ 'id': f'table_filter_id_{field.name}',