Skip to content

fix: filter list UI spacing between elements #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpgaspar merged 2 commits into from
Oct 12, 2023
Merged

fix: filter list UI spacing between elements #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c074b74
fix: filter list UI spacing between elements
dpgaspar Oct 12, 2023
b0717e2
remove alerts
dpgaspar Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions flask_appbuilder/static/appbuilder/css/ab.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

.collapse.in {
display:block;
overflow: visible;
display: block;
overflow: visible;
}

.panel-group .panel {
Expand All @@ -10,19 +10,19 @@

/* Wrapper for page content to push down footer */
.wrap {
min-height: 100%;
height: auto !important;
height: 100%;
min-height: 100%;
height: auto !important;
height: 100%;
}


.fixed-footer{
background-color: #f5f5f5;
bottom:0;
left:0;
right:0;
width:100%;
margin:auto;
.fixed-footer {
background-color: #f5f5f5;
bottom: 0;
left: 0;
right: 0;
width: 100%;
margin: auto;
}


Expand All @@ -31,7 +31,11 @@ th.action_checkboxes {
}

select {
width: 100%;
width: 100%;
}

td.filter {
width: 50%
}

.cursor-hand {
Expand Down
1 change: 0 additions & 1 deletion flask_appbuilder/static/appbuilder/js/ab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ function loadSelectDataSlave(elem) {
elem.select2({data: {id: "",text: ""}, placeholder: "Select", allowClear: true});
}
$('#' + master_id).on("change", function(e) {
var change_master_id = elem.attr('master_id');
var change_master_val = $('#' + master_id).val();
var endpoint = elem.attr('endpoint');
if (change_master_val) {
Expand Down
7 changes: 4 additions & 3 deletions flask_appbuilder/static/appbuilder/js/ab_filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var AdminFilters = function (element, labels, form, filters, active_filters) {
$field.attr('class', ' filter_val ' + $field.attr('class'));
}
$el.append(
$('<td/>').append($field)
$('<td class="filter"/>').append($field)
);
}

Expand Down Expand Up @@ -81,7 +81,7 @@ var AdminFilters = function (element, labels, form, filters, active_filters) {
cx += 1;
});
$el.append(
$('<td />').append($select)
$('<td class="filter"/>').append($select)
);
// avoids error
// if (i_option === -1) { $select.select2(); }
Expand Down Expand Up @@ -112,12 +112,13 @@ var AdminFilters = function (element, labels, form, filters, active_filters) {
$field_inner = $("input", $($field))
$field_inner.attr('name', '_flt_0_' + name);
$field_inner.attr('class', ' filter_val ' + $field_inner.attr('class'));
$field_inner.attr('style', "width: 100%");
} else {
$field.attr('name', '_flt_0_' + name);
$field.attr('class', ' filter_val ' + $field.attr('class'));
}
$el.append(
$('<td/>').append($field)
$('<td class="filter"/>').append($field)
);
if ($field.hasClass("my_select2")) {
$field.select2({
Expand Down