Skip to content
This repository was archived by the owner on Dec 3, 2021. It is now read-only.

Commit e8b351a

Browse files
xidedixxidedix
authored
Merge pull request #10 from coreui/dev-vnext
v2.1.8
2 parents db761cf + 05634b3 commit e8b351a

File tree

9 files changed

+264
-376
lines changed

9 files changed

+264
-376
lines changed

Diff for: ‎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 ending semicolons
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
- fix(cards): smooth collapse card - thanks @MartijnBastiaansen #378

Diff for: ‎package-lock.json

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

Diff for: ‎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-ajax",
3-
"version": "2.1.7",
3+
"version": "2.1.8",
44
"description": "Free Bootstrap Admin Template Ajax",
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",
@@ -89,18 +89,18 @@
8989
"clean-css-cli": "^4.2.1",
9090
"copyfiles": "^2.1.0",
9191
"cross-env": "^5.2.0",
92-
"eslint": "^5.7.0",
93-
"eslint-plugin-compat": "^2.6.2",
92+
"eslint": "^5.8.0",
93+
"eslint-plugin-compat": "^2.6.3",
9494
"foreach-cli": "^1.8.1",
9595
"js-beautify": "^1.8.8",
96-
"node-sass": "^4.9.4",
97-
"nodemon": "^1.18.4",
96+
"node-sass": "^4.10.0",
97+
"nodemon": "^1.18.6",
9898
"npm-run-all": "^4.1.3",
9999
"postcss-cli": "^6.0.1",
100100
"pug": "^2.0.3",
101101
"rimraf": "^2.6.2",
102102
"shelljs": "^0.8.2",
103-
"stylelint": "^9.6.0",
103+
"stylelint": "^9.7.1",
104104
"stylelint-config-recommended-scss": "^3.2.0",
105105
"stylelint-config-standard": "^18.2.0",
106106
"stylelint-order": "^1.0.0",

Diff for: ‎pug/views/base/switches.pug

+13-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@ block view
2626
label.switch.switch-3d.switch-danger
2727
input.switch-input(type='checkbox', checked='')
2828
span.switch-slider
29-
// /.col
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
35+
// /.col
3036
.col-md-6
3137
.card
3238
.card-header
@@ -466,9 +472,10 @@ block view
466472
.card-body.p-0
467473
table.table.table-hover.table-striped.table-align-middle.mb-0
468474
thead
469-
th Size
470-
th Example
471-
th CSS Class
475+
tr
476+
th Size
477+
th Example
478+
th CSS Class
472479
tbody
473480
tr
474481
td
@@ -478,7 +485,7 @@ block view
478485
input.switch-input(type='checkbox', checked='')
479486
span.switch-slider
480487
td
481-
| Add following class
488+
| Add following class
482489
code .switch-lg
483490
tr
484491
td
@@ -497,7 +504,7 @@ block view
497504
input.switch-input(type='checkbox', checked='')
498505
span.switch-slider
499506
td
500-
| Add following class
507+
| Add following class
501508
code .switch-sm
502509
// /.col
503510
// /.row

Diff for: ‎src/css/style.css

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

Diff for: ‎src/css/style.css.map

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

Diff for: ‎src/css/style.min.css

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

Diff for: ‎src/css/style.min.css.map

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

Diff for: ‎src/views/base/switches.html

+50-40
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
<input class="switch-input" type="checkbox" checked="" />
2929
<span class="switch-slider"></span>
3030
</label>
31+
<label class="switch switch-3d switch-primary">
32+
<input class="switch-input" type="checkbox" checked="" disabled/>
33+
<span class="switch-slider"></span>
34+
</label>
35+
<label class="switch switch-3d switch-primary">
36+
<input class="switch-input" type="checkbox" disabled />
37+
<span class="switch-slider"></span>
38+
</label>
3139
</div>
3240
</div>
3341
</div>
@@ -422,27 +430,27 @@
422430
<div class="card-body">
423431
<label class="switch switch-label switch-primary">
424432
<input class="switch-input" type="checkbox" checked="" />
425-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
433+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
426434
</label>
427435
<label class="switch switch-label switch-secondary">
428436
<input class="switch-input" type="checkbox" checked="" />
429-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
437+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
430438
</label>
431439
<label class="switch switch-label switch-success">
432440
<input class="switch-input" type="checkbox" checked="" />
433-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
441+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
434442
</label>
435443
<label class="switch switch-label switch-warning">
436444
<input class="switch-input" type="checkbox" checked="" />
437-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
445+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
438446
</label>
439447
<label class="switch switch-label switch-info">
440448
<input class="switch-input" type="checkbox" checked="" />
441-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
449+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
442450
</label>
443451
<label class="switch switch-label switch-danger">
444452
<input class="switch-input" type="checkbox" checked="" />
445-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
453+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
446454
</label>
447455
</div>
448456
</div>
@@ -454,27 +462,27 @@
454462
<div class="card-body">
455463
<label class="switch switch-label switch-pill switch-primary">
456464
<input class="switch-input" type="checkbox" checked="" />
457-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
465+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
458466
</label>
459467
<label class="switch switch-label switch-pill switch-secondary">
460468
<input class="switch-input" type="checkbox" checked="" />
461-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
469+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
462470
</label>
463471
<label class="switch switch-label switch-pill switch-success">
464472
<input class="switch-input" type="checkbox" checked="" />
465-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
473+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
466474
</label>
467475
<label class="switch switch-label switch-pill switch-warning">
468476
<input class="switch-input" type="checkbox" checked="" />
469-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
477+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
470478
</label>
471479
<label class="switch switch-label switch-pill switch-info">
472480
<input class="switch-input" type="checkbox" checked="" />
473-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
481+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
474482
</label>
475483
<label class="switch switch-label switch-pill switch-danger">
476484
<input class="switch-input" type="checkbox" checked="" />
477-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
485+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
478486
</label>
479487
</div>
480488
</div>
@@ -486,27 +494,27 @@
486494
<div class="card-body">
487495
<label class="switch switch-label switch-outline-primary">
488496
<input class="switch-input" type="checkbox" checked="" />
489-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
497+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
490498
</label>
491499
<label class="switch switch-label switch-outline-secondary">
492500
<input class="switch-input" type="checkbox" checked="" />
493-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
501+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
494502
</label>
495503
<label class="switch switch-label switch-outline-success">
496504
<input class="switch-input" type="checkbox" checked="" />
497-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
505+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
498506
</label>
499507
<label class="switch switch-label switch-outline-warning">
500508
<input class="switch-input" type="checkbox" checked="" />
501-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
509+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
502510
</label>
503511
<label class="switch switch-label switch-outline-info">
504512
<input class="switch-input" type="checkbox" checked="" />
505-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
513+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
506514
</label>
507515
<label class="switch switch-label switch-outline-danger">
508516
<input class="switch-input" type="checkbox" checked="" />
509-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
517+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
510518
</label>
511519
</div>
512520
</div>
@@ -518,27 +526,27 @@
518526
<div class="card-body">
519527
<label class="switch switch-label switch-pill switch-outline-primary">
520528
<input class="switch-input" type="checkbox" checked="" />
521-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
529+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
522530
</label>
523531
<label class="switch switch-label switch-pill switch-outline-secondary">
524532
<input class="switch-input" type="checkbox" checked="" />
525-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
533+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
526534
</label>
527535
<label class="switch switch-label switch-pill switch-outline-success">
528536
<input class="switch-input" type="checkbox" checked="" />
529-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
537+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
530538
</label>
531539
<label class="switch switch-label switch-pill switch-outline-warning">
532540
<input class="switch-input" type="checkbox" checked="" />
533-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
541+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
534542
</label>
535543
<label class="switch switch-label switch-pill switch-outline-info">
536544
<input class="switch-input" type="checkbox" checked="" />
537-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
545+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
538546
</label>
539547
<label class="switch switch-label switch-pill switch-outline-danger">
540548
<input class="switch-input" type="checkbox" checked="" />
541-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
549+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
542550
</label>
543551
</div>
544552
</div>
@@ -550,27 +558,27 @@
550558
<div class="card-body">
551559
<label class="switch switch-label switch-outline-primary-alt">
552560
<input class="switch-input" type="checkbox" checked="" />
553-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
561+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
554562
</label>
555563
<label class="switch switch-label switch-outline-secondary-alt">
556564
<input class="switch-input" type="checkbox" checked="" />
557-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
565+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
558566
</label>
559567
<label class="switch switch-label switch-outline-success-alt">
560568
<input class="switch-input" type="checkbox" checked="" />
561-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
569+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
562570
</label>
563571
<label class="switch switch-label switch-outline-warning-alt">
564572
<input class="switch-input" type="checkbox" checked="" />
565-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
573+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
566574
</label>
567575
<label class="switch switch-label switch-outline-info-alt">
568576
<input class="switch-input" type="checkbox" checked="" />
569-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
577+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
570578
</label>
571579
<label class="switch switch-label switch-outline-danger-alt">
572580
<input class="switch-input" type="checkbox" checked="" />
573-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
581+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
574582
</label>
575583
</div>
576584
</div>
@@ -582,27 +590,27 @@
582590
<div class="card-body">
583591
<label class="switch switch-label switch-pill switch-outline-primary-alt">
584592
<input class="switch-input" type="checkbox" checked="" />
585-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
593+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
586594
</label>
587595
<label class="switch switch-label switch-pill switch-outline-secondary-alt">
588596
<input class="switch-input" type="checkbox" checked="" />
589-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
597+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
590598
</label>
591599
<label class="switch switch-label switch-pill switch-outline-success-alt">
592600
<input class="switch-input" type="checkbox" checked="" />
593-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
601+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
594602
</label>
595603
<label class="switch switch-label switch-pill switch-outline-warning-alt">
596604
<input class="switch-input" type="checkbox" checked="" />
597-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
605+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
598606
</label>
599607
<label class="switch switch-label switch-pill switch-outline-info-alt">
600608
<input class="switch-input" type="checkbox" checked="" />
601-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
609+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
602610
</label>
603611
<label class="switch switch-label switch-pill switch-outline-danger-alt">
604612
<input class="switch-input" type="checkbox" checked="" />
605-
<span class="switch-slider" data-checked="&amp;#x2713" data-unchecked="&amp;#x2715"></span>
613+
<span class="switch-slider" data-checked="&#x2713;" data-unchecked="&#x2715;"></span>
606614
</label>
607615
</div>
608616
</div>
@@ -614,9 +622,11 @@
614622
<div class="card-body p-0">
615623
<table class="table table-hover table-striped table-align-middle mb-0">
616624
<thead>
617-
<th>Size</th>
618-
<th>Example</th>
619-
<th>CSS Class</th>
625+
<tr>
626+
<th>Size</th>
627+
<th>Example</th>
628+
<th>CSS Class</th>
629+
</tr>
620630
</thead>
621631
<tbody>
622632
<tr>
@@ -661,4 +671,4 @@
661671
<!-- /.col-->
662672
</div>
663673
<!-- /.row-->
664-
</div>
674+
</div>

0 commit comments

Comments
 (0)