Merge pull request #423 from coreui/dev-vnext

v2.1.3
coreui · Sep 24, 2018 · 1cd87ee · 1cd87ee
2 parents 0903c37 + 4014a67
commit 1cd87ee
Show file tree

Hide file tree

Showing 54 changed files with 1,154 additions and 379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.idea
+/.vs
 node_modules
 dist
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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`

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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"

diff --git a/pug/partials/sidebar.pug b/pug/partials/sidebar.pug
@@ -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

diff --git a/src/404.html b/src/404.html
@@ -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)
@@ -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>
diff --git a/src/500.html b/src/500.html
@@ -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)
@@ -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>
diff --git a/src/base/breadcrumb.html b/src/base/breadcrumb.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/cards.html b/src/base/cards.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/carousel.html b/src/base/carousel.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/collapse.html b/src/base/collapse.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/forms.html b/src/base/forms.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/jumbotron.html b/src/base/jumbotron.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/list-group.html b/src/base/list-group.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/navs.html b/src/base/navs.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/pagination.html b/src/base/pagination.html
@@ -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)
@@ -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>
@@ -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>
diff --git a/src/base/popovers.html b/src/base/popovers.html
@@ -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)
@@ -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>
@@ -697,4 +699,4 @@ <h6>System Utilization</h6>
     <!-- Plugins and scripts required by this view-->
     <script src="js/popovers.js"></script>
   </body>
-</html>
+</html>
diff --git a/src/base/progress.html b/src/base/progress.html
@@ -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)
@@ -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>
@@ -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>