Skip to content

Commit 329dc2a

Browse files
authored
Merge pull request #481 from coreui/dev-v2.1.next
v2.1.next
2 parents ce9cc5a + dd99d51 commit 329dc2a

18 files changed

+71
-32
lines changed

.babelrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ module.exports = {
77
"esmodules": true,
88
"ie": 10
99
},
10-
useBuiltIns: "usage",
10+
useBuiltIns: "entry",
1111
corejs: {version: 3, proposals: true},
1212
loose: true,
13-
modules: false,
13+
modules: "auto",
1414
exclude: ["transform-typeof-symbol"]
1515
}
1616
]

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## v2.1.next
2+
- fix: babelrc config
3+
- fix: missing favicon link
4+
- fix: readme links
5+
6+
##### dependencies update
7+
- update: `core-js` to `^3.1.3`
8+
- update: `babel-eslint` to `^10.0.2`
9+
- update: `eslint-plugin-compat` to `^3.1.2`
10+
111
## v2.1.14
212
- fix(main): labelColor callback for CustomTooltips
313
- chore: drop @babel/polyfill in favour of core-js@3 and regenerator-runtime

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
[![@coreui coreui](https://img.shields.io/badge/@coreui%20-coreui-lightgrey.svg?style=flat-square)](https://github.com/coreui/coreui)
2+
[![npm package][npm-coreui-badge]][npm-coreui]
3+
[![NPM downloads][npm-coreui-download]][npm-coreui]
4+
5+
[npm-coreui]: https://www.npmjs.com/package/@coreui/coreui
6+
[npm-coreui-badge]: https://img.shields.io/npm/v/@coreui/coreui.png?style=flat-square
7+
[npm-coreui-download]: https://img.shields.io/npm/dm/@coreui/coreui.svg?style=flat-square
8+
19
# CoreUI Free Bootstrap Admin Template [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Bootstrap%204%20Admin%20Template%20&url=https://coreui.io&hashtags=bootstrap,admin,template,dashboard,panel,free,angular,react,vue)
210

311
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
@@ -54,7 +62,7 @@ CoreUI is built on top of Bootstrap 4 and supports popular frameworks.
5462

5563
| CoreUI Pro | Prime | Root | Alba | Leaf |
5664
| --- | --- | --- | --- | --- |
57-
| [![CoreUI Pro Admin Template](https://coreui.io/assets/img/example-coureui.jpg)](https://coreui.io/pro/) | [![Prime Admin Template](https://genesisui.com/assets/img/templates/prime1280.jpg)](https://genesisui.com/admin-templates/bootstrap/prime/?support=1) | [![Root Admin Template](https://genesisui.com/assets/img/templates/root1280.jpg)](https://genesisui.com/admin-templates/bootstrap/root/?support=1) | [![Alba Admin Template](https://genesisui.com/assets/img/templates/alba1280.jpg)](https://genesisui.com/admin-templates/bootstrap/alba/?support=1) | [![Leaf Admin Template](https://genesisui.com/assets/img/templates/leaf1280.jpg)](https://genesisui.com/admin-templates/bootstrap/leaf/?support=1)
65+
| [![CoreUI Pro Admin Template](https://coreui.io/assets/img/example-coureui.jpg)](https://coreui.io/pro/) | [![Prime Admin Template](https://coreui.io/assets/img/responsive-prime.png)](https://coreui.io/admin-templates/bootstrap/prime/?support=1) | [![Root Admin Template](https://coreui.io/assets/img/responsive-root.png)](https://coreui.io/admin-templates/bootstrap/root/?support=1) | [![Alba Admin Template](https://coreui.io/assets/img/responsive-alba.png)](https://coreui.io/admin-templates/bootstrap/alba/?support=1) | [![Leaf Admin Template](https://coreui.io/assets/img/responsive-leaf.png)](https://coreui.io/admin-templates/bootstrap/leaf/?support=1)
5866

5967
## Installation
6068

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@coreui/icons": "0.3.0",
6969
"bootstrap": "^4.3.1",
7070
"chart.js": "^2.8.0",
71-
"core-js": "^3.1.3",
71+
"core-js": "^3.1.4",
7272
"flag-icon-css": "^3.3.0",
7373
"font-awesome": "~4.7.0",
7474
"jquery": "^3.4.1",
@@ -85,15 +85,15 @@
8585
"@babel/plugin-proposal-throw-expressions": "^7.2.0",
8686
"@babel/preset-env": "^7.4.5",
8787
"autoprefixer": "^9.6.0",
88-
"babel-eslint": "^10.0.1",
88+
"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",
9393
"copyfiles": "^2.1.0",
9494
"cross-env": "^5.2.0",
9595
"eslint": "^5.16.0",
96-
"eslint-plugin-compat": "^3.1.1",
96+
"eslint-plugin-compat": "^3.1.2",
9797
"foreach-cli": "^1.8.1",
9898
"js-beautify": "^1.10.0",
9999
"node-sass": "^4.12.0",

src/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<meta name="keyword" content="Bootstrap,Admin,Template,Open,Source,jQuery,CSS,HTML,RWD,Dashboard">
1919
<title>CoreUI Free Bootstrap Admin Template</title>
2020
<!-- Icons-->
21+
<link rel="icon" type="image/ico" href="./img/favicon.ico" sizes="any" />
2122
<link href="node_modules/@coreui/icons/css/coreui-icons.min.css" rel="stylesheet">
2223
<link href="node_modules/flag-icon-css/css/flag-icon.min.css" rel="stylesheet">
2324
<link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">

src/js/charts.js

Lines changed: 2 additions & 0 deletions
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: 2 additions & 0 deletions
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.

0 commit comments

Comments
 (0)