Skip to content

Commit

Permalink
Merge pull request #443 from coreui/dev-vnext
Browse files Browse the repository at this point in the history
v2.1.8
  • Loading branch information
xidedix authored Nov 5, 2018
2 parents 5e9af89 + 6a325bb commit de45e2b
Show file tree
Hide file tree
Showing 63 changed files with 488 additions and 703 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## v2.1.8
- feat(switches): add disabled switch example
- fix(switches): missing an ending semicolon
- fix(switches): add missing `<tr>`
- update: `@coreui/coreui` to `2.0.26`
- update: `eslint` to `5.8.0`
- update: `eslint-plugin-compat` to `2.6.3`
- update: `node-sass` to `4.10.0`
- update: `nodemon` to `1.18.6`
- update: `stylelint` to `9.7.1`

## v2.1.7
- fix(pug): crossplatform use `path.sep` instead of `/` - thanks @vasilevich
- update: `@coreui/coreui` to `2.0.21`
Expand Down
871 changes: 316 additions & 555 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-bootstrap-admin-template",
"version": "2.1.7",
"version": "2.1.8",
"description": "Free Bootstrap Admin Template",
"keywords": [
"admin",
Expand Down Expand Up @@ -63,7 +63,7 @@
"watch-pug": "nodemon -e pug -x \"npm run pug\""
},
"dependencies": {
"@coreui/coreui": "^2.0.21",
"@coreui/coreui": "^2.0.26",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
"@coreui/icons": "0.3.0",
"bootstrap": "4.1.3",
Expand All @@ -90,18 +90,18 @@
"clean-css-cli": "^4.2.1",
"copyfiles": "^2.1.0",
"cross-env": "^5.2.0",
"eslint": "^5.7.0",
"eslint-plugin-compat": "^2.6.2",
"eslint": "^5.8.0",
"eslint-plugin-compat": "^2.6.3",
"foreach-cli": "^1.8.1",
"js-beautify": "^1.8.8",
"node-sass": "^4.9.4",
"nodemon": "^1.18.4",
"node-sass": "^4.10.0",
"nodemon": "^1.18.6",
"npm-run-all": "^4.1.3",
"postcss-cli": "^6.0.1",
"pug": "^2.0.3",
"rimraf": "^2.6.2",
"shelljs": "^0.8.2",
"stylelint": "^9.6.0",
"stylelint": "^9.7.1",
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-order": "^1.0.0",
Expand Down
82 changes: 44 additions & 38 deletions pug/views/base/switches.pug
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ block view
label.switch.switch-3d.switch-danger
input.switch-input(type='checkbox', checked='')
span.switch-slider
label.switch.switch-3d.switch-primary
input.switch-input(type='checkbox', checked='', disabled='')
span.switch-slider
label.switch.switch-3d.switch-primary
input.switch-input(type='checkbox', disabled)
span.switch-slider
// /.col
.col-md-6
.card
Expand Down Expand Up @@ -322,22 +328,22 @@ block view
.card-body
label.switch.switch-label.switch-primary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-secondary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-success
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-warning
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-info
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-danger
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
// /.col
.col-md-6
.card
Expand All @@ -346,22 +352,22 @@ block view
.card-body
label.switch.switch-label.switch-pill.switch-primary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-secondary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-success
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-warning
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-info
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-danger
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
// /.col
.col-md-6
.card
Expand All @@ -370,22 +376,22 @@ block view
.card-body
label.switch.switch-label.switch-outline-primary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-secondary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-success
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-warning
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-info
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-danger
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
// /.col
.col-md-6
.card
Expand All @@ -394,22 +400,22 @@ block view
.card-body
label.switch.switch-label.switch-pill.switch-outline-primary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-secondary
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-success
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-warning
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-info
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-danger
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
// /.col
.col-md-6
.card
Expand All @@ -418,22 +424,22 @@ block view
.card-body
label.switch.switch-label.switch-outline-primary-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-secondary-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-success-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-warning-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-info-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-outline-danger-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
// /.col
.col-md-6
.card
Expand All @@ -442,22 +448,22 @@ block view
.card-body
label.switch.switch-label.switch-pill.switch-outline-primary-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-secondary-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-success-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-warning-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-info-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
label.switch.switch-label.switch-pill.switch-outline-danger-alt
input.switch-input(type='checkbox', checked='')
span.switch-slider(data-checked='&#x2713', data-unchecked='&#x2715')
span.switch-slider(data-checked='&#x2713;', data-unchecked='&#x2715;')
// /.col
.col-md-12
.card
Expand All @@ -478,7 +484,7 @@ block view
input.switch-input(type='checkbox', checked='')
span.switch-slider
td
| Add following class
| Add following class
code .switch-lg
tr
td
Expand All @@ -497,7 +503,7 @@ block view
input.switch-input(type='checkbox', checked='')
span.switch-slider
td
| Add following class
| Add following class
code .switch-sm
// /.col
// /.row
2 changes: 1 addition & 1 deletion src/404.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/500.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/breadcrumb.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/cards.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/carousel.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/collapse.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/forms.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/jumbotron.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/list-group.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/navs.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/pagination.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/popovers.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/progress.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/base/scrollspy.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.7
* @version v2.1.8
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
Loading

0 comments on commit de45e2b

Please sign in to comment.