Skip to content

Commit 75f62d2

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 Ref: https://getbootstrap.com/docs/4.6/components/forms/#select-menu Close: ttskch#49
1 parent b06f529 commit 75f62d2

File tree

6 files changed

+221
-231
lines changed

6 files changed

+221
-231
lines changed

‎.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: 82 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,21 @@
1818

1919
.select2-container--bootstrap4 .select2-selection {
2020
width: 100%;
21+
min-height: calc(1.5em + 0.75rem + 2px);
22+
padding: 0.375rem 1.75rem 0.375rem 0.75rem;
23+
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";
24+
font-size: 1rem;
25+
font-weight: 400;
26+
line-height: 1.5;
27+
color: #495057;
28+
vertical-align: middle;
2129
background-color: #fff;
2230
border: 1px solid #ced4da;
2331
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; }
32+
-webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
33+
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
34+
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
35+
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; }
2836
@media (prefers-reduced-motion: reduce) {
2937
.select2-container--bootstrap4 .select2-selection {
3038
-webkit-transition: none;
@@ -35,11 +43,6 @@
3543
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
3644
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
3745

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; }
42-
4346
.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection {
4447
border-top-left-radius: 0;
4548
border-top-right-radius: 0; }
@@ -66,133 +69,123 @@ select.is-valid ~ .select2-container--bootstrap4 .select2-selection,
6669
form.was-validated select:valid ~ .select2-container--bootstrap4 .select2-selection {
6770
border-color: #28a745; }
6871

69-
.select2-container--bootstrap4 .select2-search {
70-
width: 100%; }
71-
7272
.select2-container--bootstrap4 .select2-dropdown {
7373
border-color: #ced4da;
7474
border-radius: 0; }
7575
.select2-container--bootstrap4 .select2-dropdown.select2-dropdown--below {
76-
border-top: none;
7776
border-bottom-right-radius: 0.25rem;
7877
border-bottom-left-radius: 0.25rem; }
7978
.select2-container--bootstrap4 .select2-dropdown.select2-dropdown--above {
80-
border-top: 1px solid #ced4da;
8179
border-top-left-radius: 0.25rem;
8280
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; }
9681

9782
.select2-container--bootstrap4 .select2-results__option {
9883
padding: 0.375rem 0.75rem; }
84+
.select2-container--bootstrap4 .select2-results__option--selected {
85+
color: #212529;
86+
background-color: #e9ecef; }
87+
.select2-container--bootstrap4 .select2-results__option--highlighted {
88+
color: #fff;
89+
background-color: #007bff; }
90+
.select2-container--bootstrap4 .select2-results__option--group {
91+
padding: 0; }
92+
.select2-container--bootstrap4 .select2-results__option--group .select2-results__options--nested .select2-results__option {
93+
padding-left: 0.75rem; }
9994

10095
.select2-container--bootstrap4 .select2-results > .select2-results__options {
10196
max-height: 15em;
10297
overflow-y: auto; }
10398

10499
.select2-container--bootstrap4 .select2-results__group {
105100
display: list-item;
106-
padding: 6px;
101+
padding: 0.375rem 0.375rem;
107102
color: #6c757d; }
108103

109104
.select2-container--bootstrap4 .select2-selection__clear {
110105
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;
106+
width: 1em;
107+
height: 1em;
108+
padding: 0;
109+
margin: 0.25em 0 0;
110+
font-weight: 700;
111+
line-height: 0.75em;
112+
color: #495057;
113+
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;
119114
border-radius: 100%; }
115+
.select2-container--bootstrap4 .select2-selection__clear span {
116+
display: none; }
120117
.select2-container--bootstrap4 .select2-selection__clear:hover {
121-
background-color: #afafaf; }
118+
background-color: #d9d9d9 !important; }
119+
120+
.select2-container--bootstrap4 .select2-results__message {
121+
color: #6c757d; }
122122

123123
.select2-container--bootstrap4 .select2-selection--single {
124-
height: calc(1.5em + 0.75rem + 2px) !important; }
124+
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; }
125125
.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
126-
line-height: calc(1.5em + 0.75rem);
127126
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; }
144127
.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
145-
padding-left: 0.75rem;
146-
line-height: calc(1.5em + 0.75rem);
128+
padding: 0;
147129
color: #495057; }
148130

149-
.select2-search--dropdown .select2-search__field {
131+
.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
150132
padding: 0.375rem 0.75rem;
133+
color: #495057;
151134
border: 1px solid #ced4da;
152135
border-radius: 0.25rem; }
153-
154-
.select2-results__message {
155-
color: #6c757d; }
136+
.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field:focus {
137+
color: #495057;
138+
background-color: #fff;
139+
border-color: #80bdff;
140+
outline: 0;
141+
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
142+
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
156143

157144
.select2-container--bootstrap4 .select2-selection--multiple {
158-
min-height: calc(1.5em + 0.75rem + 2px) !important; }
145+
padding: 0 0.75rem; }
159146
.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; }
147+
margin: 0; }
148+
.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline {
149+
display: inline-block; }
166150
.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;
151+
position: relative;
152+
display: inline-block;
153+
padding: 0 5px 0 21px;
154+
margin: 0.375rem 0.375rem 0.375rem 0;
155+
color: #fff;
156+
vertical-align: top;
173157
cursor: pointer;
174-
border: 1px solid #bdc6d0;
158+
background-color: #6c757d;
175159
border-radius: 0.2rem; }
160+
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__display {
161+
padding: 0 5px; }
176162
.select2-container--bootstrap4 .select2-selection--multiple .select2-search__field {
163+
height: calc(1.5em + 0.75rem);
164+
padding-top: 0.375rem;
165+
margin: 0;
166+
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";
167+
line-height: 1.5;
177168
color: #495057; }
178-
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice + .select2-search {
179-
width: 0; }
180169
.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;
170+
position: absolute;
171+
top: 0;
172+
left: 0;
173+
padding: 0 5px;
174+
margin: 0;
186175
font-weight: 700;
187-
color: #bdc6d0; }
176+
color: rgba(255, 255, 255, 0.75);
177+
cursor: pointer;
178+
background: none;
179+
border: none;
180+
border-right: 1px solid #a1a8ae; }
188181
.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover {
189-
color: #343a40; }
182+
color: rgba(255, 255, 255, 0.85); }
183+
.select2-container--bootstrap4 .select2-selection--multiple.select2-selection--clearable {
184+
padding-right: 32px; }
190185
.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; }
186+
position: absolute;
187+
top: 0.375rem;
188+
right: 0.75rem; }
196189

197190
.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
198191
padding: 0 5px;

0 commit comments

Comments
 (0)