Skip to content

Commit 1a0c800

Browse files
taglialatagliala
committed
Add compatibility with Select2 4.1
- Uses Bootstrap's `custom-select` implementation for uniformity - Use SVG background image for clear button - Add some lints to improve code readability - Use the same Browserlist configuration as Bootstrap 4.6 Ref: https://getbootstrap.com/docs/4.6/components/forms/#select-menu Close: #49, #61
1 parent b06f529 commit 1a0c800

7 files changed

Lines changed: 239 additions & 253 deletions

File tree

‎.stylelintrc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
"stylelint-config-twbs-bootstrap/scss"
44
],
55
"rules": {
6-
"selector-class-pattern": "^[a-z][a-z0-9\\-_]*[a-z0-9]$"
6+
"block-closing-brace-empty-line-before": "never",
7+
"declaration-no-important": null,
8+
"rule-empty-line-before": ["always", {
9+
"except": ["first-nested"],
10+
"ignore": ["after-comment"]
11+
}],
12+
"selector-class-pattern": "^[a-z][a-z0-9\\-_]*[a-z0-9]$",
13+
"selector-no-qualifying-type": null
714
}
815
}

‎dist/select2-bootstrap4.css‎

Lines changed: 85 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
outline: 0; }
55

66
.input-group .select2-container--bootstrap4 {
7-
-webkit-box-flex: 1;
8-
-ms-flex-positive: 1;
9-
flex-grow: 1; }
7+
-ms-flex-positive: 1;
8+
flex-grow: 1; }
109

1110
.input-group-prepend ~ .select2-container--bootstrap4 .select2-selection {
1211
border-top-left-radius: 0;
@@ -18,27 +17,25 @@
1817

1918
.select2-container--bootstrap4 .select2-selection {
2019
width: 100%;
20+
min-height: calc(1.5em + 0.75rem + 2px);
21+
padding: 0.375rem 1.75rem 0.375rem 0.75rem;
22+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
23+
font-size: 1rem;
24+
font-weight: 400;
25+
line-height: 1.5;
26+
color: #495057;
27+
vertical-align: middle;
2128
background-color: #fff;
2229
border: 1px solid #ced4da;
2330
border-radius: 0.25rem;
24-
-webkit-transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
25-
transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
26-
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
27-
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; }
31+
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; }
2832
@media (prefers-reduced-motion: reduce) {
2933
.select2-container--bootstrap4 .select2-selection {
30-
-webkit-transition: none;
3134
transition: none; } }
3235

3336
.select2-container--bootstrap4.select2-container--focus .select2-selection {
3437
border-color: #80bdff;
35-
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
36-
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
37-
38-
.select2-container--bootstrap4.select2-container--focus.select2-container--open .select2-selection {
39-
border-bottom: none;
40-
border-bottom-right-radius: 0;
41-
border-bottom-left-radius: 0; }
38+
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
4239

4340
.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection {
4441
border-top-left-radius: 0;
@@ -48,15 +45,12 @@
4845
border-bottom-right-radius: 0;
4946
border-bottom-left-radius: 0; }
5047

51-
.select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-selection {
48+
.select2-container--bootstrap4.select2-container--disabled .select2-selection,
49+
.select2-container--bootstrap4.select2-container--disabled .select2-search__field {
5250
cursor: not-allowed;
5351
background-color: #e9ecef;
5452
border-color: #ced4da;
55-
-webkit-box-shadow: none;
56-
box-shadow: none; }
57-
58-
.select2-container--bootstrap4.select2-container--disabled .select2-search__field, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-search__field {
59-
background-color: transparent; }
53+
box-shadow: none; }
6054

6155
select.is-invalid ~ .select2-container--bootstrap4 .select2-selection,
6256
form.was-validated select:invalid ~ .select2-container--bootstrap4 .select2-selection {
@@ -66,136 +60,125 @@ select.is-valid ~ .select2-container--bootstrap4 .select2-selection,
6660
form.was-validated select:valid ~ .select2-container--bootstrap4 .select2-selection {
6761
border-color: #28a745; }
6862

69-
.select2-container--bootstrap4 .select2-search {
70-
width: 100%; }
71-
7263
.select2-container--bootstrap4 .select2-dropdown {
7364
border-color: #ced4da;
7465
border-radius: 0; }
7566
.select2-container--bootstrap4 .select2-dropdown.select2-dropdown--below {
76-
border-top: none;
7767
border-bottom-right-radius: 0.25rem;
7868
border-bottom-left-radius: 0.25rem; }
7969
.select2-container--bootstrap4 .select2-dropdown.select2-dropdown--above {
80-
border-top: 1px solid #ced4da;
8170
border-top-left-radius: 0.25rem;
8271
border-top-right-radius: 0.25rem; }
83-
.select2-container--bootstrap4 .select2-dropdown .select2-results__option[aria-selected="true"] {
84-
color: #212529;
85-
background-color: #f2f2f2; }
86-
87-
.select2-container--bootstrap4 .select2-results__option--highlighted,
88-
.select2-container--bootstrap4 .select2-results__option--highlighted.select2-results__option[aria-selected="true"] {
89-
color: #fff;
90-
background-color: #007bff; }
91-
92-
.select2-container--bootstrap4 .select2-results__option[role="group"] {
93-
padding: 0; }
94-
.select2-container--bootstrap4 .select2-results__option[role="group"] .select2-results__options--nested .select2-results__option {
95-
padding-left: 1em; }
9672

9773
.select2-container--bootstrap4 .select2-results__option {
9874
padding: 0.375rem 0.75rem; }
75+
.select2-container--bootstrap4 .select2-results__option--selected {
76+
color: #212529;
77+
background-color: #e9ecef; }
78+
.select2-container--bootstrap4 .select2-results__option--highlighted {
79+
color: #fff;
80+
background-color: #007bff; }
81+
.select2-container--bootstrap4 .select2-results__option--group {
82+
padding: 0; }
83+
.select2-container--bootstrap4 .select2-results__option--group .select2-results__options--nested .select2-results__option {
84+
padding-left: 0.75rem; }
9985

10086
.select2-container--bootstrap4 .select2-results > .select2-results__options {
10187
max-height: 15em;
10288
overflow-y: auto; }
10389

10490
.select2-container--bootstrap4 .select2-results__group {
10591
display: list-item;
106-
padding: 6px;
92+
padding: 0.375rem 0.375rem;
10793
color: #6c757d; }
10894

10995
.select2-container--bootstrap4 .select2-selection__clear {
11096
float: right;
111-
width: .9em;
112-
height: .9em;
113-
padding-left: .15em;
114-
margin-top: .7em;
115-
margin-right: .3em;
116-
line-height: .75em;
117-
color: #f8f9fa;
118-
background-color: #c8c8c8;
97+
width: 1em;
98+
height: 1em;
99+
padding: 0;
100+
margin: 0.25em 0 0;
101+
font-weight: 700;
102+
line-height: 0.75em;
103+
color: #495057;
104+
background: #e6e6e6 url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10' viewBox='0 0 16 16'%3e%3cpath fill='%23495057' d='M1 12l4-4-4-4 3-3 4 4 4-4 3 3-4 4 4 4-3 3-4-4-4 4z'/%3e%3c/svg%3e") center no-repeat !important;
119105
border-radius: 100%; }
106+
.select2-container--bootstrap4 .select2-selection__clear span {
107+
display: none; }
120108
.select2-container--bootstrap4 .select2-selection__clear:hover {
121-
background-color: #afafaf; }
109+
background-color: #d9d9d9 !important; }
110+
111+
.select2-container--bootstrap4 .select2-results__message {
112+
color: #6c757d; }
122113

123114
.select2-container--bootstrap4 .select2-selection--single {
124-
height: calc(1.5em + 0.75rem + 2px) !important; }
115+
background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat; }
125116
.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
126-
line-height: calc(1.5em + 0.75rem);
127117
color: #6c757d; }
128-
.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
129-
position: absolute;
130-
top: 50%;
131-
right: 3px;
132-
width: 20px; }
133-
.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
134-
position: absolute;
135-
top: 60%;
136-
left: 50%;
137-
width: 0;
138-
height: 0;
139-
margin-top: -2px;
140-
margin-left: -4px;
141-
border-color: #343a40 transparent transparent transparent;
142-
border-style: solid;
143-
border-width: 5px 4px 0; }
144118
.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
145-
padding-left: 0.75rem;
146-
line-height: calc(1.5em + 0.75rem);
119+
padding: 0;
147120
color: #495057; }
148121

149-
.select2-search--dropdown .select2-search__field {
122+
.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
150123
padding: 0.375rem 0.75rem;
124+
color: #495057;
151125
border: 1px solid #ced4da;
152126
border-radius: 0.25rem; }
153-
154-
.select2-results__message {
155-
color: #6c757d; }
127+
.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field:focus {
128+
color: #495057;
129+
background-color: #fff;
130+
border-color: #80bdff;
131+
outline: 0;
132+
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
156133

157134
.select2-container--bootstrap4 .select2-selection--multiple {
158-
min-height: calc(1.5em + 0.75rem + 2px) !important; }
135+
padding: 0 0.75rem; }
159136
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
160-
-webkit-box-sizing: border-box;
161-
box-sizing: border-box;
162-
width: 100%;
163-
padding: 0 0.375rem;
164-
margin: 0;
165-
list-style: none; }
137+
margin: 0; }
138+
.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline {
139+
display: inline-block; }
166140
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
167-
float: left;
168-
padding: 0;
169-
padding-right: 0.75rem;
170-
margin-top: calc(0.375rem - 2px);
171-
margin-right: 0.375rem;
172-
color: #495057;
141+
position: relative;
142+
display: inline-block;
143+
padding: 0 5px 0 21px;
144+
margin: 0.375rem 0.375rem 0.375rem 0;
145+
color: #fff;
146+
vertical-align: top;
173147
cursor: pointer;
174-
border: 1px solid #bdc6d0;
148+
background-color: #6c757d;
175149
border-radius: 0.2rem; }
150+
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__display {
151+
padding: 0 5px; }
176152
.select2-container--bootstrap4 .select2-selection--multiple .select2-search__field {
153+
height: calc(1.5em + 0.75rem);
154+
padding-top: 0.375rem;
155+
margin: 0;
156+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
157+
line-height: 1.5;
177158
color: #495057; }
178-
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice + .select2-search {
179-
width: 0; }
180159
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove {
181-
float: left;
182-
padding-right: 3px;
183-
padding-left: 3px;
184-
margin-right: 1px;
185-
margin-left: 3px;
160+
position: absolute;
161+
top: 0;
162+
left: 0;
163+
padding: 0 5px;
164+
margin: 0;
186165
font-weight: 700;
187-
color: #bdc6d0; }
166+
color: rgba(255, 255, 255, 0.75);
167+
cursor: pointer;
168+
background: none;
169+
border: none;
170+
border-right: 1px solid #a1a8ae; }
188171
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover {
189-
color: #343a40; }
172+
color: rgba(255, 255, 255, 0.85); }
173+
.select2-container--bootstrap4 .select2-selection--multiple.select2-selection--clearable {
174+
padding-right: 32px; }
190175
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
191-
position: absolute !important;
192-
top: 0;
193-
right: .7em;
194-
float: none;
195-
margin-right: 0; }
176+
position: absolute;
177+
top: 0.375rem;
178+
right: 0.75rem; }
196179

197180
.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
198-
padding: 0 5px;
181+
padding-left: 5px;
199182
cursor: not-allowed; }
200183
.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice .select2-selection__choice__remove {
201184
display: none; }

0 commit comments

Comments
 (0)