Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'Preorder/add-search-for-campaign-filter' into 'master'

Browse Source 
added new features

See merge request fronk/thetool!1667
This commit is contained in:
Luca Haid
2025-08-20 12:59:57 +00:00
parent e1ca641dab b5e6b19ea2
commit 56f4aa424b
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Layout/default/Preorder/Index.php
View File

@@ -665,6 +665,7 @@ $pagination_entity_name = "Vorbestellungen";
todayBtn: 'linked',
autoclose: true
});
$("#filter_preordercampaign_id").select2({closeOnSelect: false});
$("#filter_type").select2({closeOnSelect: false});
$("#filter_status").select2({closeOnSelect: false});
$("#filter_partner_id").select2({closeOnSelect: false});

12
public/assets/css/app.css
View File

@@ -1686,24 +1686,24 @@ Responsive Menu
background-color: #007bff;
color: #fff; }
.select2-container .select2-selection--multiple {
.select2-container .select2-selection {
min-height: 38px;
border: 1px solid #ced4da !important; }
.select2-container .select2-selection--multiple .select2-selection__rendered {
.select2-container .select2-selection .select2-selection__rendered {
padding: 1px 10px; }
.select2-container .select2-selection--multiple .select2-search__field {
.select2-container .select2-selection .select2-search__field {
border: 0; }
.select2-container .select2-selection--multiple .select2-selection__choice {
.select2-container .select2-selection .select2-selection__choice {
background-color: #007bff;
border: none;
color: #fff;
border-radius: 3px;
padding: 0 7px;
margin-top: 7px; }
.select2-container .select2-selection--multiple .select2-selection__choice__remove {
.select2-container .select2-selection .select2-selection__choice__remove {
color: #fff;
margin-right: 5px; }
.select2-container .select2-selection--multiple .select2-selection__choice__remove:hover {
.select2-container .select2-selection .select2-selection__choice__remove:hover {
color: #fff; }
.daterangepicker {

6
public/assets/css/thetool.css
View File

@@ -242,13 +242,13 @@ h1, h2, h3, h4, h5, h6 {
padding-left: 12px !important;
}
.select2-container .select2-selection--multiple .select2-selection__choice {
.select2-container .select2-selection .select2-selection__choice {
background-color: #007bff !important;
color: #fff !important;
border: none !important;
}
.select2-container .select2-selection--multiple .select2-selection__choice__remove {
.select2-container .select2-selection .select2-selection__choice__remove {
color: #fff !important;
margin-right: 5px !important;
}
@@ -261,7 +261,7 @@ h1, h2, h3, h4, h5, h6 {
max-height: 400px !important;
}
#banned_rimo_fcp + .select2-container .select2-selection--multiple .select2-selection__choice {
#banned_rimo_fcp + .select2-container .select2-selection .select2-selection__choice {
background-color: var(--red) !important;
}