Skip to content

Commit de45e2b

Browse files
xidedixxidedix
authored
Merge pull request #443 from coreui/dev-vnext
v2.1.8
2 parents 5e9af89 + 6a325bb commit de45e2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+488
-703
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## v2.1.8
2+
- feat(switches): add disabled switch example
3+
- fix(switches): missing an ending semicolon
4+
- fix(switches): add missing `<tr>`
5+
- update: `@coreui/coreui` to `2.0.26`
6+
- update: `eslint` to `5.8.0`
7+
- update: `eslint-plugin-compat` to `2.6.3`
8+
- update: `node-sass` to `4.10.0`
9+
- update: `nodemon` to `1.18.6`
10+
- update: `stylelint` to `9.7.1`
11+
112
## v2.1.7
213
- fix(pug): crossplatform use `path.sep` instead of `/` - thanks @vasilevich
314
- update: `@coreui/coreui` to `2.0.21`

‎package-lock.json

+316-555
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-bootstrap-admin-template",
3-
"version": "2.1.7",
3+
"version": "2.1.8",
44
"description": "Free Bootstrap Admin Template",
55
"keywords": [
66
"admin",
@@ -63,7 +63,7 @@
6363
"watch-pug": "nodemon -e pug -x \"npm run pug\""
6464
},
6565
"dependencies": {
66-
"@coreui/coreui": "^2.0.21",
66+
"@coreui/coreui": "^2.0.26",
6767
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
6868
"@coreui/icons": "0.3.0",
6969
"bootstrap": "4.1.3",
@@ -90,18 +90,18 @@
9090
"clean-css-cli": "^4.2.1",
9191
"copyfiles": "^2.1.0",
9292
"cross-env": "^5.2.0",
93-
"eslint": "^5.7.0",
94-
"eslint-plugin-compat": "^2.6.2",
93+
"eslint": "^5.8.0",
94+
"eslint-plugin-compat": "^2.6.3",
9595
"foreach-cli": "^1.8.1",
9696
"js-beautify": "^1.8.8",
97-
"node-sass": "^4.9.4",
98-
"nodemon": "^1.18.4",
97+
"node-sass": "^4.10.0",
98+
"nodemon": "^1.18.6",
9999
"npm-run-all": "^4.1.3",
100100
"postcss-cli": "^6.0.1",
101101
"pug": "^2.0.3",
102102
"rimraf": "^2.6.2",
103103
"shelljs": "^0.8.2",
104-
"stylelint": "^9.6.0",
104+
"stylelint": "^9.7.1",
105105
"stylelint-config-recommended-scss": "^3.2.0",
106106
"stylelint-config-standard": "^18.2.0",
107107
"stylelint-order": "^1.0.0",

‎pug/views/base/switches.pug

+44-38
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ block view
2626
label.switch.switch-3d.switch-danger
2727
input.switch-input(type='checkbox', checked='')
2828
span.switch-slider
29+
label.switch.switch-3d.switch-primary
30+
input.switch-input(type='checkbox', checked='', disabled='')
31+
span.switch-slider
32+
label.switch.switch-3d.switch-primary
33+
input.switch-input(type='checkbox', disabled)
34+
span.switch-slider
2935
// /.col
3036
.col-md-6
3137
.card
@@ -322,22 +328,22 @@ block view
322328
.card-body
323329
label.switch.switch-label.switch-primary
324330
input.switch-input(type='checkbox', checked='')
325-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
331+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
326332
label.switch.switch-label.switch-secondary
327333
input.switch-input(type='checkbox', checked='')
328-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
334+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
329335
label.switch.switch-label.switch-success
330336
input.switch-input(type='checkbox', checked='')
331-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
337+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
332338
label.switch.switch-label.switch-warning
333339
input.switch-input(type='checkbox', checked='')
334-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
340+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
335341
label.switch.switch-label.switch-info
336342
input.switch-input(type='checkbox', checked='')
337-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
343+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
338344
label.switch.switch-label.switch-danger
339345
input.switch-input(type='checkbox', checked='')
340-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
346+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
341347
// /.col
342348
.col-md-6
343349
.card
@@ -346,22 +352,22 @@ block view
346352
.card-body
347353
label.switch.switch-label.switch-pill.switch-primary
348354
input.switch-input(type='checkbox', checked='')
349-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
355+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
350356
label.switch.switch-label.switch-pill.switch-secondary
351357
input.switch-input(type='checkbox', checked='')
352-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
358+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
353359
label.switch.switch-label.switch-pill.switch-success
354360
input.switch-input(type='checkbox', checked='')
355-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
361+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
356362
label.switch.switch-label.switch-pill.switch-warning
357363
input.switch-input(type='checkbox', checked='')
358-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
364+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
359365
label.switch.switch-label.switch-pill.switch-info
360366
input.switch-input(type='checkbox', checked='')
361-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
367+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
362368
label.switch.switch-label.switch-pill.switch-danger
363369
input.switch-input(type='checkbox', checked='')
364-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
370+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
365371
// /.col
366372
.col-md-6
367373
.card
@@ -370,22 +376,22 @@ block view
370376
.card-body
371377
label.switch.switch-label.switch-outline-primary
372378
input.switch-input(type='checkbox', checked='')
373-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
379+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
374380
label.switch.switch-label.switch-outline-secondary
375381
input.switch-input(type='checkbox', checked='')
376-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
382+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
377383
label.switch.switch-label.switch-outline-success
378384
input.switch-input(type='checkbox', checked='')
379-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
385+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
380386
label.switch.switch-label.switch-outline-warning
381387
input.switch-input(type='checkbox', checked='')
382-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
388+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
383389
label.switch.switch-label.switch-outline-info
384390
input.switch-input(type='checkbox', checked='')
385-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
391+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
386392
label.switch.switch-label.switch-outline-danger
387393
input.switch-input(type='checkbox', checked='')
388-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
394+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
389395
// /.col
390396
.col-md-6
391397
.card
@@ -394,22 +400,22 @@ block view
394400
.card-body
395401
label.switch.switch-label.switch-pill.switch-outline-primary
396402
input.switch-input(type='checkbox', checked='')
397-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
403+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
398404
label.switch.switch-label.switch-pill.switch-outline-secondary
399405
input.switch-input(type='checkbox', checked='')
400-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
406+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
401407
label.switch.switch-label.switch-pill.switch-outline-success
402408
input.switch-input(type='checkbox', checked='')
403-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
409+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
404410
label.switch.switch-label.switch-pill.switch-outline-warning
405411
input.switch-input(type='checkbox', checked='')
406-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
412+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
407413
label.switch.switch-label.switch-pill.switch-outline-info
408414
input.switch-input(type='checkbox', checked='')
409-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
415+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
410416
label.switch.switch-label.switch-pill.switch-outline-danger
411417
input.switch-input(type='checkbox', checked='')
412-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
418+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
413419
// /.col
414420
.col-md-6
415421
.card
@@ -418,22 +424,22 @@ block view
418424
.card-body
419425
label.switch.switch-label.switch-outline-primary-alt
420426
input.switch-input(type='checkbox', checked='')
421-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
427+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
422428
label.switch.switch-label.switch-outline-secondary-alt
423429
input.switch-input(type='checkbox', checked='')
424-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
430+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
425431
label.switch.switch-label.switch-outline-success-alt
426432
input.switch-input(type='checkbox', checked='')
427-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
433+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
428434
label.switch.switch-label.switch-outline-warning-alt
429435
input.switch-input(type='checkbox', checked='')
430-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
436+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
431437
label.switch.switch-label.switch-outline-info-alt
432438
input.switch-input(type='checkbox', checked='')
433-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
439+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
434440
label.switch.switch-label.switch-outline-danger-alt
435441
input.switch-input(type='checkbox', checked='')
436-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
442+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
437443
// /.col
438444
.col-md-6
439445
.card
@@ -442,22 +448,22 @@ block view
442448
.card-body
443449
label.switch.switch-label.switch-pill.switch-outline-primary-alt
444450
input.switch-input(type='checkbox', checked='')
445-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
451+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
446452
label.switch.switch-label.switch-pill.switch-outline-secondary-alt
447453
input.switch-input(type='checkbox', checked='')
448-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
454+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
449455
label.switch.switch-label.switch-pill.switch-outline-success-alt
450456
input.switch-input(type='checkbox', checked='')
451-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
457+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
452458
label.switch.switch-label.switch-pill.switch-outline-warning-alt
453459
input.switch-input(type='checkbox', checked='')
454-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
460+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
455461
label.switch.switch-label.switch-pill.switch-outline-info-alt
456462
input.switch-input(type='checkbox', checked='')
457-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
463+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
458464
label.switch.switch-label.switch-pill.switch-outline-danger-alt
459465
input.switch-input(type='checkbox', checked='')
460-
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
466+
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
461467
// /.col
462468
.col-md-12
463469
.card
@@ -478,7 +484,7 @@ block view
478484
input.switch-input(type='checkbox', checked='')
479485
span.switch-slider
480486
td
481-
| Add following class
487+
| Add following class
482488
code .switch-lg
483489
tr
484490
td
@@ -497,7 +503,7 @@ block view
497503
input.switch-input(type='checkbox', checked='')
498504
span.switch-slider
499505
td
500-
| Add following class
506+
| Add following class
501507
code .switch-sm
502508
// /.col
503509
// /.row

‎src/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/500.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/breadcrumb.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/cards.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/carousel.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/collapse.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/forms.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/jumbotron.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/list-group.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/navs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/pagination.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/popovers.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/progress.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/base/scrollspy.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI - Free Bootstrap Admin Template
4-
* @version v2.1.7
4+
* @version v2.1.8
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

0 commit comments

Comments
 (0)