Skip to content

Commit 1cd87ee

Browse files
xidedixxidedix
authored
Merge pull request #423 from coreui/dev-vnext
v2.1.3
2 parents 0903c37 + 4014a67 commit 1cd87ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1154
-379
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/.idea
2+
/.vs
23
node_modules
34
dist

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## v2.1.3
2+
- fix(sidebar.pug): split icons/flags `li.nav-item`
3+
- update: `@coreui/coreui` to `2.0.9`
4+
- update: `flag-icon-css` to `3.2.0`
5+
- update: `@babel/cli` to `7.1.0`
6+
- update: `@babel/core` to `7.1.0`
7+
- update: `@babel/preset-env` to `7.1.0`
8+
- update: `eslint` to `5.6.0`
9+
- update: `js-beautify` to `1.8.6`
10+
- update: `stylelint-scss` to `3.3.1`
11+
112
## v2.1.2
213
- Update: `@coreui/coreui` to `2.0.6`
314
- Update: `bootstrap` to `4.1.3`

‎package-lock.json

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

‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-bootstrap-admin-template",
3-
"version": "2.1.2",
3+
"version": "2.1.3",
44
"description": "Free Bootstrap Admin Template",
55
"keywords": [
66
"admin",
@@ -63,12 +63,12 @@
6363
"watch-pug": "nodemon -e pug -x \"npm run pug\""
6464
},
6565
"dependencies": {
66-
"@coreui/coreui": "2.0.6",
66+
"@coreui/coreui": "2.0.9",
6767
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
6868
"@coreui/icons": "0.3.0",
6969
"bootstrap": "4.1.3",
7070
"chart.js": "^2.7.2",
71-
"flag-icon-css": "3.0.0",
71+
"flag-icon-css": "3.2.0",
7272
"font-awesome": "4.7.0",
7373
"jquery": "3.3.1",
7474
"pace-progress": "1.0.2",
@@ -77,10 +77,10 @@
7777
"simple-line-icons": "2.4.1"
7878
},
7979
"devDependencies": {
80-
"@babel/cli": "^7.0.0",
81-
"@babel/core": "^7.0.0",
80+
"@babel/cli": "^7.1.0",
81+
"@babel/core": "^7.1.0",
8282
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
83-
"@babel/preset-env": "^7.0.0",
83+
"@babel/preset-env": "^7.1.0",
8484
"autoprefixer": "^9.1.5",
8585
"babel-eslint": "^9.0.0",
8686
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
@@ -89,10 +89,10 @@
8989
"clean-css-cli": "^4.2.1",
9090
"copyfiles": "^2.1.0",
9191
"cross-env": "^5.2.0",
92-
"eslint": "^5.5.0",
92+
"eslint": "^5.6.0",
9393
"eslint-plugin-compat": "^2.5.1",
9494
"foreach-cli": "^1.8.0",
95-
"js-beautify": "^1.8.4",
95+
"js-beautify": "^1.8.6",
9696
"node-sass": "^4.9.3",
9797
"nodemon": "^1.18.4",
9898
"npm-run-all": "^4.1.3",
@@ -104,7 +104,7 @@
104104
"stylelint-config-recommended-scss": "^3.2.0",
105105
"stylelint-config-standard": "^18.2.0",
106106
"stylelint-order": "^1.0.0",
107-
"stylelint-scss": "^3.3.0"
107+
"stylelint-scss": "^3.3.1"
108108
},
109109
"engines": {
110110
"node": ">=6"

‎pug/partials/sidebar.pug

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
i.nav-icon.icon-star
124124
| CoreUI Icons
125125
span.badge.badge-success NEW
126+
li.nav-item
126127
a.nav-link(href='icons/flags.html')
127128
i.nav-icon.icon-star
128129
| Flags

‎src/404.html

+2-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -71,4 +71,4 @@ <h4 class="pt-3">Oops! You're lost.</h4>
7171
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
7272
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
7373
</body>
74-
</html>
74+
</html>

‎src/500.html

+2-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -71,4 +71,4 @@ <h4 class="pt-3">Houston, we have a problem!</h4>
7171
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
7272
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
7373
</body>
74-
</html>
74+
</html>

‎src/base/breadcrumb.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -713,4 +715,4 @@ <h6>System Utilization</h6>
713715
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
714716
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
715717
</body>
716-
</html>
718+
</html>

‎src/base/cards.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -995,4 +997,4 @@ <h6>System Utilization</h6>
995997
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
996998
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
997999
</body>
998-
</html>
1000+
</html>

‎src/base/carousel.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -819,4 +821,4 @@ <h6>System Utilization</h6>
819821
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
820822
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
821823
</body>
822-
</html>
824+
</html>

‎src/base/collapse.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -785,4 +787,4 @@ <h6>System Utilization</h6>
785787
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
786788
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
787789
</body>
788-
</html>
790+
</html>

‎src/base/forms.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -1732,4 +1734,4 @@ <h6>System Utilization</h6>
17321734
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
17331735
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
17341736
</body>
1735-
</html>
1737+
</html>

‎src/base/jumbotron.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -707,4 +709,4 @@ <h6>System Utilization</h6>
707709
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
708710
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
709711
</body>
710-
</html>
712+
</html>

‎src/base/list-group.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -902,4 +904,4 @@ <h6>System Utilization</h6>
902904
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
903905
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
904906
</body>
905-
</html>
907+
</html>

‎src/base/navs.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -1024,4 +1026,4 @@ <h6>System Utilization</h6>
10241026
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
10251027
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
10261028
</body>
1027-
</html>
1029+
</html>

‎src/base/pagination.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -895,4 +897,4 @@ <h6>System Utilization</h6>
895897
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
896898
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
897899
</body>
898-
</html>
900+
</html>

‎src/base/popovers.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -697,4 +699,4 @@ <h6>System Utilization</h6>
697699
<!-- Plugins and scripts required by this view-->
698700
<script src="js/popovers.js"></script>
699701
</body>
700-
</html>
702+
</html>

‎src/base/progress.html

+4-2
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.0.0
4+
* @version v2.1.3
55
* @link https://coreui.io
66
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
77
* Licensed under MIT (https://coreui.io/license)
@@ -259,6 +259,8 @@
259259
<i class="nav-icon icon-star"></i> CoreUI Icons
260260
<span class="badge badge-success">NEW</span>
261261
</a>
262+
</li>
263+
<li class="nav-item">
262264
<a class="nav-link" href="icons/flags.html">
263265
<i class="nav-icon icon-star"></i> Flags</a>
264266
</li>
@@ -781,4 +783,4 @@ <h6>System Utilization</h6>
781783
<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
782784
<script src="node_modules/@coreui/coreui/dist/js/coreui.min.js"></script>
783785
</body>
784-
</html>
786+
</html>

0 commit comments

Comments
 (0)