Skip to content

Commit 6d1a72c

Browse files
committed
Merge remote-tracking branch 'origin/bump-to-bootstrap4' into bump-to-bootstrap4
2 parents 5d8c2c3 + 0671e05 commit 6d1a72c

File tree

4 files changed

+507
-331
lines changed

4 files changed

+507
-331
lines changed

awesome-bootstrap-checkbox.css

Lines changed: 127 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
.checkbox {
1+
.abc-checkbox {
22
padding-left: 20px;
33
}
4-
.checkbox label {
4+
.abc-checkbox label {
55
display: inline-block;
66
vertical-align: middle;
77
position: relative;
88
padding-left: 5px;
99
}
10-
.checkbox label::before {
10+
.abc-checkbox label::before {
1111
content: "";
1212
display: inline-block;
1313
position: absolute;
@@ -22,7 +22,7 @@
2222
-o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
2323
transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
2424
}
25-
.checkbox label::after {
25+
.abc-checkbox label::after {
2626
display: inline-block;
2727
position: absolute;
2828
width: 16px;
@@ -35,98 +35,164 @@
3535
font-size: 11px;
3636
color: #555555;
3737
}
38-
.checkbox input[type="checkbox"],
39-
.checkbox input[type="radio"] {
38+
.abc-checkbox input[type="checkbox"],
39+
.abc-checkbox input[type="radio"] {
4040
opacity: 0;
4141
z-index: 1;
4242
}
43-
.checkbox input[type="checkbox"]:focus + label::before,
44-
.checkbox input[type="radio"]:focus + label::before {
43+
.abc-checkbox input[type="checkbox"]:focus + label::before,
44+
.abc-checkbox input[type="radio"]:focus + label::before {
4545
outline: thin dotted;
4646
outline: 5px auto -webkit-focus-ring-color;
4747
outline-offset: -2px;
4848
}
49-
.checkbox input[type="checkbox"]:checked + label::after,
50-
.checkbox input[type="radio"]:checked + label::after {
49+
.abc-checkbox input[type="checkbox"]:checked + label::after,
50+
.abc-checkbox input[type="radio"]:checked + label::after {
5151
font-family: "FontAwesome";
5252
content: "\f00c";
5353
}
54-
.checkbox input[type="checkbox"]:disabled + label,
55-
.checkbox input[type="radio"]:disabled + label {
54+
.abc-checkbox input[type="checkbox"]:indeterminate + label::after,
55+
.abc-checkbox input[type="radio"]:indeterminate + label::after {
56+
display: block;
57+
content: "";
58+
width: 10px;
59+
height: 3px;
60+
background-color: #555555;
61+
border-radius: 2px;
62+
margin-left: -16.5px;
63+
margin-top: 7px;
64+
}
65+
.abc-checkbox input[type="checkbox"]:disabled + label,
66+
.abc-checkbox input[type="radio"]:disabled + label {
5667
opacity: 0.65;
5768
}
58-
.checkbox input[type="checkbox"]:disabled + label::before,
59-
.checkbox input[type="radio"]:disabled + label::before {
69+
.abc-checkbox input[type="checkbox"]:disabled + label::before,
70+
.abc-checkbox input[type="radio"]:disabled + label::before {
6071
background-color: #eeeeee;
6172
cursor: not-allowed;
6273
}
63-
.checkbox.checkbox-circle label::before {
74+
.abc-checkbox.abc-checkbox-circle label::before {
6475
border-radius: 50%;
6576
}
66-
.checkbox.checkbox-inline {
77+
.abc-checkbox.abc-checkbox-inline {
6778
margin-top: 0;
6879
}
6980

70-
.checkbox-primary input[type="checkbox"]:checked + label::before,
71-
.checkbox-primary input[type="radio"]:checked + label::before {
81+
.abc-checkbox-primary input[type="checkbox"]:checked + label::before,
82+
.abc-checkbox-primary input[type="radio"]:checked + label::before {
7283
background-color: #337ab7;
7384
border-color: #337ab7;
7485
}
75-
.checkbox-primary input[type="checkbox"]:checked + label::after,
76-
.checkbox-primary input[type="radio"]:checked + label::after {
86+
.abc-checkbox-primary input[type="checkbox"]:checked + label::after,
87+
.abc-checkbox-primary input[type="radio"]:checked + label::after {
7788
color: #fff;
7889
}
7990

80-
.checkbox-danger input[type="checkbox"]:checked + label::before,
81-
.checkbox-danger input[type="radio"]:checked + label::before {
91+
.abc-checkbox-danger input[type="checkbox"]:checked + label::before,
92+
.abc-checkbox-danger input[type="radio"]:checked + label::before {
8293
background-color: #d9534f;
8394
border-color: #d9534f;
8495
}
85-
.checkbox-danger input[type="checkbox"]:checked + label::after,
86-
.checkbox-danger input[type="radio"]:checked + label::after {
96+
.abc-checkbox-danger input[type="checkbox"]:checked + label::after,
97+
.abc-checkbox-danger input[type="radio"]:checked + label::after {
8798
color: #fff;
8899
}
89100

90-
.checkbox-info input[type="checkbox"]:checked + label::before,
91-
.checkbox-info input[type="radio"]:checked + label::before {
101+
.abc-checkbox-info input[type="checkbox"]:checked + label::before,
102+
.abc-checkbox-info input[type="radio"]:checked + label::before {
92103
background-color: #5bc0de;
93104
border-color: #5bc0de;
94105
}
95-
.checkbox-info input[type="checkbox"]:checked + label::after,
96-
.checkbox-info input[type="radio"]:checked + label::after {
106+
.abc-checkbox-info input[type="checkbox"]:checked + label::after,
107+
.abc-checkbox-info input[type="radio"]:checked + label::after {
97108
color: #fff;
98109
}
99110

100-
.checkbox-warning input[type="checkbox"]:checked + label::before,
101-
.checkbox-warning input[type="radio"]:checked + label::before {
111+
.abc-checkbox-warning input[type="checkbox"]:checked + label::before,
112+
.abc-checkbox-warning input[type="radio"]:checked + label::before {
102113
background-color: #f0ad4e;
103114
border-color: #f0ad4e;
104115
}
105-
.checkbox-warning input[type="checkbox"]:checked + label::after,
106-
.checkbox-warning input[type="radio"]:checked + label::after {
116+
.abc-checkbox-warning input[type="checkbox"]:checked + label::after,
117+
.abc-checkbox-warning input[type="radio"]:checked + label::after {
107118
color: #fff;
108119
}
109120

110-
.checkbox-success input[type="checkbox"]:checked + label::before,
111-
.checkbox-success input[type="radio"]:checked + label::before {
121+
.abc-checkbox-success input[type="checkbox"]:checked + label::before,
122+
.abc-checkbox-success input[type="radio"]:checked + label::before {
112123
background-color: #5cb85c;
113124
border-color: #5cb85c;
114125
}
115-
.checkbox-success input[type="checkbox"]:checked + label::after,
116-
.checkbox-success input[type="radio"]:checked + label::after {
126+
.abc-checkbox-success input[type="checkbox"]:checked + label::after,
127+
.abc-checkbox-success input[type="radio"]:checked + label::after {
117128
color: #fff;
118129
}
119130

120-
.radio {
131+
.abc-checkbox-primary input[type="checkbox"]:indeterminate + label::before,
132+
.abc-checkbox-primary input[type="radio"]:indeterminate + label::before {
133+
background-color: #337ab7;
134+
border-color: #337ab7;
135+
}
136+
137+
.abc-checkbox-primary input[type="checkbox"]:indeterminate + label::after,
138+
.abc-checkbox-primary input[type="radio"]:indeterminate + label::after {
139+
background-color: #fff;
140+
}
141+
142+
.abc-checkbox-danger input[type="checkbox"]:indeterminate + label::before,
143+
.abc-checkbox-danger input[type="radio"]:indeterminate + label::before {
144+
background-color: #d9534f;
145+
border-color: #d9534f;
146+
}
147+
148+
.abc-checkbox-danger input[type="checkbox"]:indeterminate + label::after,
149+
.abc-checkbox-danger input[type="radio"]:indeterminate + label::after {
150+
background-color: #fff;
151+
}
152+
153+
.abc-checkbox-info input[type="checkbox"]:indeterminate + label::before,
154+
.abc-checkbox-info input[type="radio"]:indeterminate + label::before {
155+
background-color: #5bc0de;
156+
border-color: #5bc0de;
157+
}
158+
159+
.abc-checkbox-info input[type="checkbox"]:indeterminate + label::after,
160+
.abc-checkbox-info input[type="radio"]:indeterminate + label::after {
161+
background-color: #fff;
162+
}
163+
164+
.abc-checkbox-warning input[type="checkbox"]:indeterminate + label::before,
165+
.abc-checkbox-warning input[type="radio"]:indeterminate + label::before {
166+
background-color: #f0ad4e;
167+
border-color: #f0ad4e;
168+
}
169+
170+
.abc-checkbox-warning input[type="checkbox"]:indeterminate + label::after,
171+
.abc-checkbox-warning input[type="radio"]:indeterminate + label::after {
172+
background-color: #fff;
173+
}
174+
175+
.abc-checkbox-success input[type="checkbox"]:indeterminate + label::before,
176+
.abc-checkbox-success input[type="radio"]:indeterminate + label::before {
177+
background-color: #5cb85c;
178+
border-color: #5cb85c;
179+
}
180+
181+
.abc-checkbox-success input[type="checkbox"]:indeterminate + label::after,
182+
.abc-checkbox-success input[type="radio"]:indeterminate + label::after {
183+
background-color: #fff;
184+
}
185+
186+
.abc-radio {
121187
padding-left: 20px;
122188
}
123-
.radio label {
189+
.abc-radio label {
124190
display: inline-block;
125191
vertical-align: middle;
126192
position: relative;
127193
padding-left: 5px;
128194
}
129-
.radio label::before {
195+
.abc-radio label::before {
130196
content: "";
131197
display: inline-block;
132198
position: absolute;
@@ -141,7 +207,7 @@
141207
-o-transition: border 0.15s ease-in-out;
142208
transition: border 0.15s ease-in-out;
143209
}
144-
.radio label::after {
210+
.abc-radio label::after {
145211
display: inline-block;
146212
position: absolute;
147213
content: " ";
@@ -161,78 +227,78 @@
161227
-o-transition: -o-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
162228
transition: transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
163229
}
164-
.radio input[type="radio"] {
230+
.abc-radio input[type="radio"] {
165231
opacity: 0;
166232
z-index: 1;
167233
}
168-
.radio input[type="radio"]:focus + label::before {
234+
.abc-radio input[type="radio"]:focus + label::before {
169235
outline: thin dotted;
170236
outline: 5px auto -webkit-focus-ring-color;
171237
outline-offset: -2px;
172238
}
173-
.radio input[type="radio"]:checked + label::after {
239+
.abc-radio input[type="radio"]:checked + label::after {
174240
-webkit-transform: scale(1, 1);
175241
-ms-transform: scale(1, 1);
176242
-o-transform: scale(1, 1);
177243
transform: scale(1, 1);
178244
}
179-
.radio input[type="radio"]:disabled + label {
245+
.abc-radio input[type="radio"]:disabled + label {
180246
opacity: 0.65;
181247
}
182-
.radio input[type="radio"]:disabled + label::before {
248+
.abc-radio input[type="radio"]:disabled + label::before {
183249
cursor: not-allowed;
184250
}
185-
.radio.radio-inline {
251+
.abc-radio.radio-inline {
186252
margin-top: 0;
187253
}
188254

189-
.radio-primary input[type="radio"] + label::after {
255+
.abc-radio-primary input[type="radio"] + label::after {
190256
background-color: #337ab7;
191257
}
192-
.radio-primary input[type="radio"]:checked + label::before {
258+
.abc-radio-primary input[type="radio"]:checked + label::before {
193259
border-color: #337ab7;
194260
}
195-
.radio-primary input[type="radio"]:checked + label::after {
261+
.abc-radio-primary input[type="radio"]:checked + label::after {
196262
background-color: #337ab7;
197263
}
198264

199-
.radio-danger input[type="radio"] + label::after {
265+
.abc-radio-danger input[type="radio"] + label::after {
200266
background-color: #d9534f;
201267
}
202-
.radio-danger input[type="radio"]:checked + label::before {
268+
.abc-radio-danger input[type="radio"]:checked + label::before {
203269
border-color: #d9534f;
204270
}
205-
.radio-danger input[type="radio"]:checked + label::after {
271+
.abc-radio-danger input[type="radio"]:checked + label::after {
206272
background-color: #d9534f;
207273
}
208274

209-
.radio-info input[type="radio"] + label::after {
275+
.abc-radio-info input[type="radio"] + label::after {
210276
background-color: #5bc0de;
211277
}
212-
.radio-info input[type="radio"]:checked + label::before {
278+
.abc-radio-info input[type="radio"]:checked + label::before {
213279
border-color: #5bc0de;
214280
}
215-
.radio-info input[type="radio"]:checked + label::after {
281+
.abc-radio-info input[type="radio"]:checked + label::after {
216282
background-color: #5bc0de;
217283
}
218284

219-
.radio-warning input[type="radio"] + label::after {
285+
.abc-radio-warning input[type="radio"] + label::after {
220286
background-color: #f0ad4e;
221287
}
222-
.radio-warning input[type="radio"]:checked + label::before {
288+
.abc-radio-warning input[type="radio"]:checked + label::before {
223289
border-color: #f0ad4e;
224290
}
225-
.radio-warning input[type="radio"]:checked + label::after {
291+
.abc-radio-warning input[type="radio"]:checked + label::after {
226292
background-color: #f0ad4e;
227293
}
228294

229-
.radio-success input[type="radio"] + label::after {
295+
.abc-radio-success input[type="radio"] + label::after {
230296
background-color: #5cb85c;
231297
}
232-
.radio-success input[type="radio"]:checked + label::before {
298+
.abc-radio-success input[type="radio"]:checked + label::before {
233299
border-color: #5cb85c;
234300
}
235-
.radio-success input[type="radio"]:checked + label::after {
301+
.abc-radio-success input[type="radio"]:checked + label::after {
236302
background-color: #5cb85c;
237303
}
238304

0 commit comments

Comments
 (0)