Skip to content

Commit 73cf096

Browse files
authored
Merge pull request #1169 from s-eckard/master
Fix style of select in input groups and fix keyboard behaviour in forms
2 parents 79c8a70 + b519de3 commit 73cf096

File tree

6 files changed

+165
-84
lines changed

6 files changed

+165
-84
lines changed

dist/css/bootstrap-multiselect.css

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,25 @@ span.multiselect-native-select select {
131131
.form-inline .multiselect-container span.form-check {
132132
padding: 3px 20px 3px 40px;
133133
}
134+
.input-group.input-group-sm > .multiselect-native-select .multiselect {
135+
padding: 0.25rem 0.5rem;
136+
font-size: 0.875rem;
137+
line-height: 1.5;
138+
padding-right: 1.75rem;
139+
height: calc(1.5em + 0.5rem + 2px);
140+
}
141+
.input-group > .multiselect-native-select {
142+
flex: 1 1 auto;
143+
width: 1%;
144+
}
145+
.input-group > .multiselect-native-select > div.btn-group {
146+
width: 100%;
147+
}
148+
.input-group > .multiselect-native-select:not(:first-child) .multiselect {
149+
border-top-left-radius: 0;
150+
border-bottom-left-radius: 0;
151+
}
152+
.input-group > .multiselect-native-select:not(:last-child) .multiselect {
153+
border-top-right-radius: 0;
154+
border-bottom-right-radius: 0;
155+
}

dist/css/bootstrap-multiselect.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/bootstrap-multiselect.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,10 @@
441441
button: '<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"><span class="multiselect-selected-text"></span></button>',
442442
popupContainer: '<div class="multiselect-container dropdown-menu"></div>',
443443
filter: '<div class="multiselect-filter d-flex align-items-center"><i class="fas fa-sm fa-search text-muted"></i><input type="search" class="multiselect-search form-control" /></div>',
444-
option: '<button class="multiselect-option dropdown-item"></button>',
444+
option: '<button type="button" class="multiselect-option dropdown-item"></button>',
445445
divider: '<div class="dropdown-divider"></div>',
446-
optionGroup: '<button class="multiselect-group dropdown-item"></button>',
447-
resetButton: '<div class="multiselect-reset text-center p-2"><button class="btn btn-sm btn-block btn-outline-secondary"></button></div>'
446+
optionGroup: '<button type="button" class="multiselect-group dropdown-item"></button>',
447+
resetButton: '<div class="multiselect-reset text-center p-2"><button type="button" class="btn btn-sm btn-block btn-outline-secondary"></button></div>'
448448
}
449449
},
450450

dist/js/bootstrap-multiselect.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/less/bootstrap-multiselect.less

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,32 @@ span.multiselect-native-select select{
139139
padding: 3px 20px 3px 40px;
140140
}
141141
}
142+
143+
.input-group {
144+
&.input-group-sm > .multiselect-native-select .multiselect {
145+
padding: .25rem .5rem;
146+
font-size: .875rem;
147+
line-height: 1.5;
148+
padding-right: 1.75rem;
149+
height: calc(1.5em + .5rem + 2px);
150+
}
151+
152+
> .multiselect-native-select {
153+
flex: 1 1 auto;
154+
width: 1%;
155+
156+
> div.btn-group {
157+
width: 100%;
158+
}
159+
160+
&:not(:first-child) .multiselect {
161+
border-top-left-radius: 0;
162+
border-bottom-left-radius: 0;
163+
}
164+
165+
&:not(:last-child) .multiselect {
166+
border-top-right-radius: 0;
167+
border-bottom-right-radius: 0;
168+
}
169+
}
170+
}

0 commit comments

Comments
 (0)