Skip to content

v2.1.3 #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.idea
/.vs
node_modules
dist
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## v2.1.3
- fix(sidebar.pug): split icons/flags `li.nav-item`
- update: `@coreui/coreui` to `2.0.9`
- update: `flag-icon-css` to `3.2.0`
- update: `@babel/cli` to `7.1.0`
- update: `@babel/core` to `7.1.0`
- update: `@babel/preset-env` to `7.1.0`
- update: `eslint` to `5.6.0`
- update: `js-beautify` to `1.8.6`
- update: `stylelint-scss` to `3.3.1`

## v2.1.2
- Update: `@coreui/coreui` to `2.0.6`
- Update: `bootstrap` to `4.1.3`
Expand Down
925 changes: 740 additions & 185 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 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.2",
"version": "2.1.3",
"description": "Free Bootstrap Admin Template",
"keywords": [
"admin",
Expand Down Expand Up @@ -63,12 +63,12 @@
"watch-pug": "nodemon -e pug -x \"npm run pug\""
},
"dependencies": {
"@coreui/coreui": "2.0.6",
"@coreui/coreui": "2.0.9",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
"@coreui/icons": "0.3.0",
"bootstrap": "4.1.3",
"chart.js": "^2.7.2",
"flag-icon-css": "3.0.0",
"flag-icon-css": "3.2.0",
"font-awesome": "4.7.0",
"jquery": "3.3.1",
"pace-progress": "1.0.2",
Expand All @@ -77,10 +77,10 @@
"simple-line-icons": "2.4.1"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/cli": "^7.1.0",
"@babel/core": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"autoprefixer": "^9.1.5",
"babel-eslint": "^9.0.0",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
Expand All @@ -89,10 +89,10 @@
"clean-css-cli": "^4.2.1",
"copyfiles": "^2.1.0",
"cross-env": "^5.2.0",
"eslint": "^5.5.0",
"eslint": "^5.6.0",
"eslint-plugin-compat": "^2.5.1",
"foreach-cli": "^1.8.0",
"js-beautify": "^1.8.4",
"js-beautify": "^1.8.6",
"node-sass": "^4.9.3",
"nodemon": "^1.18.4",
"npm-run-all": "^4.1.3",
Expand All @@ -104,7 +104,7 @@
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-order": "^1.0.0",
"stylelint-scss": "^3.3.0"
"stylelint-scss": "^3.3.1"
},
"engines": {
"node": ">=6"
Expand Down
1 change: 1 addition & 0 deletions pug/partials/sidebar.pug
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
i.nav-icon.icon-star
| CoreUI Icons
span.badge.badge-success NEW
li.nav-item
a.nav-link(href='icons/flags.html')
i.nav-icon.icon-star
| Flags
Expand Down
4 changes: 2 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -71,4 +71,4 @@ <h4 class="pt-3">Oops! You're lost.</h4>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -71,4 +71,4 @@ <h4 class="pt-3">Houston, we have a problem!</h4>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -713,4 +715,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -995,4 +997,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -819,4 +821,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -785,4 +787,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -1732,4 +1734,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -707,4 +709,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -902,4 +904,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -1024,4 +1026,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -895,4 +897,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -697,4 +699,4 @@ <h6>System Utilization</h6>
<!-- Plugins and scripts required by this view-->
<script src="js/popovers.js"></script>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions 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.0.0
* @version v2.1.3
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down Expand Up @@ -259,6 +259,8 @@
<i class="nav-icon icon-star"></i> CoreUI Icons
<span class="badge badge-success">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="icons/flags.html">
<i class="nav-icon icon-star"></i> Flags</a>
</li>
Expand Down Expand Up @@ -781,4 +783,4 @@ <h6>System Utilization</h6>
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
</body>
</html>
</html>
Loading