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

Commit 4fefed9

Browse files
xidedixxidedix
committed
Merge branch 'dependabot'
2 parents 5469532 + ee42f4a commit 4fefed9

23 files changed

+644
-523
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
## v2.1.next
1+
## v2.1.15
22
- fix: babelrc config
33
- fix: missing favicon link
4+
- fix(cards): outdated switch class, add card-header-actions
5+
- chore(deps): bump lodash to 4.17.14
46

57
##### dependencies update
6-
- update: `core-js` to `^3.1.3`
8+
- update: `core-js` to `^3.1.4`
79
- update: `babel-eslint` to `^10.0.2`
10+
- update: `@babel/cli` to `^7.5.0`
11+
- update: `@babel/core` to `^7.5.4`
12+
- update: `@babel/plugin-proposal-object-rest-spread` to `^7.5.4`
13+
- update: `@babel/preset-env` to `^7.5.4`
14+
- update: `autoprefixer` to `^9.6.1`
15+
- update: `copyfiles` to `^2.1.1`
16+
- update: `eslint-plugin-compat` to `^3.2.0`
17+
- update: `postcss-cli` to `^6.1.3`
18+
- update: `pug` to `^2.0.4`
19+
- update: `stylelint-order` to `^3.0.1`
20+
- update: `stylelint-scss` to `^3.9.1`
821

922
## v2.1.14
1023
- fix(main): labelColor callback for CustomTooltips

‎package-lock.json

Lines changed: 580 additions & 477 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 13 additions & 13 deletions
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.14",
3+
"version": "2.1.15",
44
"description": "Free Bootstrap Admin Template Ajax",
55
"keywords": [
66
"admin",
@@ -79,38 +79,38 @@
7979
"simple-line-icons": "2.4.1"
8080
},
8181
"devDependencies": {
82-
"@babel/cli": "^7.4.4",
83-
"@babel/core": "^7.4.5",
84-
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
82+
"@babel/cli": "^7.5.0",
83+
"@babel/core": "^7.5.4",
84+
"@babel/plugin-proposal-object-rest-spread": "^7.5.4",
8585
"@babel/plugin-proposal-throw-expressions": "^7.2.0",
86-
"@babel/preset-env": "^7.4.5",
87-
"autoprefixer": "^9.6.0",
86+
"@babel/preset-env": "^7.5.4",
87+
"autoprefixer": "^9.6.1",
8888
"babel-eslint": "^10.0.2",
8989
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
9090
"browser-sync": "^2.26.7",
9191
"chalk": "^2.4.2",
9292
"clean-css-cli": "^4.3.0",
93-
"copyfiles": "^2.1.0",
93+
"copyfiles": "^2.1.1",
9494
"cross-env": "^5.2.0",
9595
"eslint": "^5.16.0",
96-
"eslint-plugin-compat": "^3.1.2",
96+
"eslint-plugin-compat": "^3.2.0",
9797
"foreach-cli": "^1.8.1",
9898
"js-beautify": "^1.10.0",
9999
"node-sass": "^4.12.0",
100100
"nodemon": "^1.19.1",
101101
"npm-run-all": "^4.1.5",
102-
"postcss-cli": "^6.1.2",
103-
"pug": "^2.0.3",
102+
"postcss-cli": "^6.1.3",
103+
"pug": "^2.0.4",
104104
"rimraf": "^2.6.3",
105105
"shelljs": "^0.8.3",
106106
"stylelint": "^10.1.0",
107107
"stylelint-config-recommended-scss": "^3.3.0",
108108
"stylelint-config-standard": "^18.3.0",
109-
"stylelint-order": "^3.0.0",
110-
"stylelint-scss": "^3.8.0"
109+
"stylelint-order": "^3.0.1",
110+
"stylelint-scss": "^3.9.1"
111111
},
112112
"engines": {
113-
"node": ">=6"
113+
"node": ">=8"
114114
},
115115
"browserslist": [
116116
"last 1 major version",

‎src/index.html

Lines changed: 1 addition & 1 deletion
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.14
4+
* @version v2.1.15
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)

‎src/js/charts.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/charts.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/colors.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/colors.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/main.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/popovers.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/popovers.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/src/charts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import $ from 'jquery'
44

55
/**
66
* --------------------------------------------------------------------------
7-
* CoreUI Free Boostrap Admin Template (v2.1.14): main.js
7+
* CoreUI Free Boostrap Admin Template (v2.1.15): main.js
88
* Licensed under MIT (https://coreui.io/license)
99
* --------------------------------------------------------------------------
1010
*/

‎src/js/src/colors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import $ from 'jquery'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* CoreUI Free Boostrap Admin Template (v2.1.14): colors.js
6+
* CoreUI Free Boostrap Admin Template (v2.1.15): colors.js
77
* Licensed under MIT (https://coreui.io/license)
88
* --------------------------------------------------------------------------
99
*/

‎src/js/src/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import $ from 'jquery'
44

55
/**
66
* --------------------------------------------------------------------------
7-
* CoreUI Free Boostrap Admin Template (v2.1.14): main.js
7+
* CoreUI Free Boostrap Admin Template (v2.1.15): main.js
88
* Licensed under MIT (https://coreui.io/license)
99
* --------------------------------------------------------------------------
1010
*/

‎src/js/src/popovers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import $ from 'jquery'
22

33
/**
44
* --------------------------------------------------------------------------
5-
* CoreUI Free Boostrap Admin Template (v2.1.14): popovers.js
5+
* CoreUI Free Boostrap Admin Template (v2.1.15): popovers.js
66
* Licensed under MIT (https://coreui.io/license)
77
* --------------------------------------------------------------------------
88
*/

‎src/js/src/tooltips.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import $ from 'jquery'
22

33
/**
44
* --------------------------------------------------------------------------
5-
* CoreUI Free Boostrap Admin Template (v2.1.14): tooltips.js
5+
* CoreUI Free Boostrap Admin Template (v2.1.15): tooltips.js
66
* Licensed under MIT (https://coreui.io/license)
77
* --------------------------------------------------------------------------
88
*/

‎src/js/src/widgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import $ from 'jquery'
33

44
/**
55
* --------------------------------------------------------------------------
6-
* CoreUI Free Boostrap Admin Template (v2.1.14): main.js
6+
* CoreUI Free Boostrap Admin Template (v2.1.15): main.js
77
* Licensed under MIT (https://coreui.io/license)
88
* --------------------------------------------------------------------------
99
*/

‎src/js/tooltips.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/tooltips.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/widgets.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/widgets.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/views/base/cards.html

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@
2828
<div class="col-sm-6 col-md-4">
2929
<div class="card">
3030
<div class="card-header">Card with switch
31-
<label class="switch switch-sm switch-text switch-info float-right mb-0">
32-
<input class="switch-input" type="checkbox" />
33-
<span class="switch-label" data-on="On" data-off="Off"></span>
34-
<span class="switch-handle"></span>
31+
<div class="card-header-actions" style="height: 21px;">
32+
<label class="switch switch-sm switch-label switch-info" tabindex="0">
33+
<input type="checkbox" class="switch-input" checked>
34+
<span class="switch-slider" data-checked="On" data-unchecked="Off"></span>
3535
</label>
36+
</div>
3637
</div>
3738
<div class="card-body">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip
3839
ex ea commodo consequat.</div>
@@ -42,7 +43,9 @@
4243
<div class="col-sm-6 col-md-4">
4344
<div class="card">
4445
<div class="card-header">Card with label
45-
<span class="badge badge-success float-right">Success</span>
46+
<div class="card-header-actions" style="height: 21px;">
47+
<span class="badge badge-success">Success</span>
48+
</div>
4649
</div>
4750
<div class="card-body">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip
4851
ex ea commodo consequat.</div>
@@ -52,7 +55,9 @@
5255
<div class="col-sm-6 col-md-4">
5356
<div class="card">
5457
<div class="card-header">Card with label
55-
<span class="badge badge-pill badge-danger float-right">42</span>
58+
<div class="card-header-actions" style="height: 21px;">
59+
<span class="badge badge-pill badge-danger">42</span>
60+
</div>
5661
</div>
5762
<div class="card-body">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip
5863
ex ea commodo consequat.</div>
@@ -300,12 +305,12 @@
300305
</a>
301306
</div>
302307
</div>
303-
<div class="collapse show" id="collapseExample">
304-
<div class="card-body">
305-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex
306-
ea commodo consequat.
307-
</div>
308-
</div>
308+
<div class="collapse show" id="collapseExample">
309+
<div class="card-body">
310+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex
311+
ea commodo consequat.
312+
</div>
313+
</div>
309314
</div>
310315
</div>
311316
<!-- /.col-->

0 commit comments

Comments
 (0)