Merge branch 'master' into fix-missing-dependency

Author: xidedix

.gitignore

@@ -1,3 +1,4 @@
 /.idea
+/.vs
 node_modules
 dist

CHANGELOG.md

@@ -1,5 +1,89 @@
-## v2.1.0
+## v2.1.6
+- fix(cards): smooth collapse card - thanks @MartijnBastiaansen #378
+- fix(header): migrate `.divider` to `.dropdown-divider` - thanks @vanam #406
+- chore: build/change-version cleanup
+- docs(readme): fix broken hyperlinks to 6 versions
+- update: `@coreui/coreui` to `2.0.19`
+  - fix: `transparent` is not a valid rgb color ie issue
+  - fix(card): rtl for card-header icon margins
+  - fix(sidebar): rtl for sidebar-minimizer icon
+  - fix(breadcrumb): rtl padding
+  - fix(card): rtl float for card-header-actions
+  - fix(sidebar): rtl ps scrollbar issue temp fix/refactor
+  - feat(sidebar) badge margins for nav-dropdown-toggle
+  - fix(scss): add missing light-blue color variable
+- update: `chart.js` to `2.7.3`
+- update: `core-js` to `2.5.7`
+- update: `autoprefixer` to `9.2.0`
+- update: `browser-sync` to `2.26.3`
+- update: `eslint` to `5.7.0`
+- update: `eslint-plugin-compat` to `2.6.2`
+- update: `js-beautify` to `1.8.7`
+- update: `node-sass` to `4.9.4`
+
+## v2.1.5
+- update: `@coreui/coreui` to `2.0.12` 
+   - fix(layout) aside IE issue with .main margin on mobile
+   - fix(sidebar) rtl IE issue with sidebar-minimized captions
+   - fix(sidebar) rtl ps scrollbar issue temp fix
+- update: `@babel/cli` to `7.1.2`
+- update: `@babel/core` to `7.1.2`
+- update: `eslint to `5.6.1`
+- update: `foreach-cli` to `1.8.1`
+ 
+## v2.1.4
+- feat(basic-forms): add missing `date-input` 
+- update: `@coreui/coreui` to `2.0.11` fixes some IE11 and `rtl` issues
+- chore: update `babel-eslint` to `10.0.1`
+- chore: update `stylelint` to `9.6.0`
+
+## 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`
+- Update: `popper.js` to `1.14.4`
+- Update: `@babel/cli` to `^7.0.0`
+- Update: `@babel/core` to `^7.0.0`
+- Update: `@babel/plugin-proposal-object-rest-spread` to `^7.0.0`
+- Update: `@babel/preset-env` to `^7.0.0`
+- Update: `autoprefixer` to `^9.1.5`
+- Update: `babel-eslint` to `^9.0.0`
+- Update: `browser-sync` to `^2.24.7`
+- Update: `clean-css-cli` to `^4.2.1`
+- Update: `copyfiles` to `^2.1.0`
+- Update: `cross-env` to `^5.2.0`
+- Update: `eslint` to `^5.5.0`
+- Update: `eslint-plugin-compat` to `^2.5.1`
+- Update: `node-sass` to `^4.9.3`
+- Update: `nodemon` to `^1.18.4`
+- Update: `postcss-cli` to `^6.0.0`
+- Update: `shelljs` to `^0.8.2`
+- Update: `stylelint` to `^9.5.0`
+- Update: `stylelint-order` to `^1.0.0`
+- Update: `stylelint-scss` to `^3.3.0`
 
+## v2.1.1
+- Update: @coreui/coreui to 2.0.3
+- Update: @babel/cli to 7.0.0-beta.53
+- Update: @babel/core to 7.0.0-beta.53
+- Update: @babel/plugin-proposal-object-rest-spread to 7.0.0-beta.53
+- Update: @babel/preset-env to 7.0.0-beta.53
+- Update: babel-eslint to 8.2.6
+- Update: bootstrap to 4.1.2
+- Update: eslint-plugin-compat to 2.5.0
+- Update: nodemon to 1.18.1                                     
+
+## v2.1.0
 - **Feat: Add pug support**
 - Update: @coreui/coreui-icons to 0.3.0
 - Update: @coreui/coreui to 2.0.3

README.md

@@ -1,12 +1,16 @@
 # 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)
 
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
 Please help us on [Product Hunt](https://www.producthunt.com/posts/coreui-open-source-bootstrap-4-admin-template-with-angular-2-react-js-vue-js-support) and [Designer News](https://www.designernews.co/stories/81127). Thanks in advance!
 
+[![Bootstrap Admin Template](https://coreui.io/assets/img/example-coureui.jpg)](https://coreui.io/)
+
 Curious why I decided to create CoreUI? Please read this article: [Jack of all trades, master of none. Why Bootstrap Admin Templates suck.](https://medium.com/@lukaszholeczek/jack-of-all-trades-master-of-none-5ea53ef8a1f#.7eqx1bcd8)
 
 CoreUI is an Open Source Bootstrap Admin Template. But CoreUI is not just another Admin Template. It goes way beyond hitherto admin templates thanks to transparent code and file structure. And if that's not enough, let’s just add that CoreUI consists bunch of unique features and over 1000 high quality icons.
 
-CoreUI is based on Bootstrap 4 and offers 6 versions: [HTML5 AJAX](https://github.com/coreui/free-bootstrap-admin-template-ajax), [HTML5](https://github.com/coreui/free-angular-admin-template), [Angular 2+](https://github.com/coreui/free-angular-admin-template), [React.js](https://github.com/coreui/free-react-admin-template) & [Vue.js](https://github.com/coreui/free-vue-admin-template), [.NET Core 2](https://github.com/coreui/free-dotnet-admin-template).
+CoreUI is based on Bootstrap 4 and offers 6 versions: [HTML5 AJAX](https://github.com/coreui/coreui-free-bootstrap-admin-template-ajax), [HTML5](https://github.com/coreui/coreui-free-angular-admin-template), [Angular 2+](https://github.com/coreui/coreui-free-angular-admin-template), [React.js](https://github.com/coreui/coreui-free-react-admin-template) & [Vue.js](https://github.com/coreui/coreui-free-vue-admin-template), [.NET Core 2](https://github.com/mrholek/CoreUI-NET).
 
 CoreUI is meant to be the UX game changer. Pure & transparent code is devoid of redundant components, so the app is light enough to offer ultimate user experience. This means mobile devices also, where the navigation is just as easy and intuitive as on a desktop or laptop. The CoreUI Layout API lets you customize your project for almost any device – be it Mobile, Web or WebApp – CoreUI covers them all!
 
@@ -36,7 +40,7 @@ CoreUI is built on top of Bootstrap 4 and supports popular frameworks.
 * [CoreUI Free Angular 2+ Admin Template](https://github.com/coreui/coreui-free-angular-admin-template)
 * 🚧 CoreUI Free .NET Core 2 Admin Template (Available Soon)
 * [CoreUI Free React.js Admin Template](https://github.com/coreui/coreui-free-react-admin-template)
-* 🚧 CoreUI Free Vue.js Admin Template (Available Soon)
+* [CoreUI Free Vue.js Admin Template](https://github.com/coreui/coreui-free-vue-admin-template)
 
 ## CoreUI Pro
 

build/change-version.js

@@ -41,11 +41,9 @@ function walkAsync(directory, excludedDirectories, fileCallback, errback) {
         }
         if (stats.isSymbolicLink()) {
           return
-        }
-        else if (stats.isDirectory()) {
+        } else if (stats.isDirectory()) {
           process.nextTick(walkAsync, filepath, excludedDirectories, fileCallback, errback)
-        }
-        else if (stats.isFile()) {
+        } else if (stats.isFile()) {
           process.nextTick(fileCallback, filepath)
         }
       })
@@ -85,7 +83,10 @@ function main(args) {
   const newVersion = args[1]
   const EXCLUDED_DIRS = new Set([
     '.git',
+    '.idea',
+    'dist',
     'node_modules',
+    'pug',
     'vendor'
   ])
   const INCLUDED_EXTENSIONS = new Set([

build/pug.js

@@ -43,7 +43,7 @@ const isPug = (filename) => {
 }
 
 const compile = (filename, basedir) => {
-  const levels = filename.replace('pug/views/', '').replace('pug/pages/', '').split('/').length
+  const levels = filename.replace(`pug${path.sep}views${path.sep}`, '').replace(`pug${path.sep}pages${path.sep}`, '').split(`${path.sep}`).length
   const base = (levels) => {
     let path = './'
     while (levels > 1) {
@@ -83,9 +83,9 @@ const compileHtml = () => {
       const html = compile(view, './pug/layout/')
       let file
       if (version === 'ajax') {
-        file = view.replace('pug/', '').replace('.pug', '.html')
+        file = view.replace(`pug${path.sep}`, '').replace('.pug', '.html')
       } else {
-        file = view.replace('pug/views/', '').replace('.pug', '.html')
+        file = view.replace(`pug${path.sep}views${path.sep}`, '').replace('.pug', '.html')
       }
       // Create tree
       mkdirp.sync(resolve(dest, dirname(file)))
@@ -103,7 +103,7 @@ const compileHtml = () => {
   pages.forEach((page) => {
     if (isPug(page)) {
       const html = compile(page, './pug/layout/')
-      const file = page.replace('pug/pages/', '').replace('.pug', '.html')
+      const file = page.replace(`pug${path.sep}pages${path.sep}`, '').replace('.pug', '.html')
       // Create tree
       mkdirp.sync(resolve(dest, dirname(file)))
       // Create HTML file