Merge pull request #448 from coreui/dev-vnext

v2.1.10
coreui · Nov 27, 2018 · 83b06ab · 83b06ab
2 parents d6d0349 + 17332a9
commit 83b06ab
Show file tree

Hide file tree

Showing 66 changed files with 108 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.1.10
+- fix: update `nodemon` to `1.18.7` (remove vulnerability)
+- update: `@coreui/coreui` to `^2.1.3`
+- update: `stylelint-order` to `^2.0.0`
+- refactor(modals): buttons margin
+
 ## v2.1.9
 - fix: devDependencies security issues (event-stream, flatmap-stream)
 - chore: dependencies update

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.9",
+  "version": "2.1.10",
   "description": "Free Bootstrap Admin Template",
   "keywords": [
     "admin",
@@ -63,7 +63,7 @@
     "watch-pug": "nodemon -e pug -x \"npm run pug\""
   },
   "dependencies": {
-    "@coreui/coreui": "^2.1.2",
+    "@coreui/coreui": "^2.1.3",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
     "@coreui/icons": "0.3.0",
     "bootstrap": "4.1.3",
@@ -95,7 +95,7 @@
     "foreach-cli": "^1.8.1",
     "js-beautify": "^1.8.8",
     "node-sass": "^4.10.0",
-    "nodemon": "^1.18.6",
+    "nodemon": "^1.18.7",
     "npm-run-all": "^4.1.5",
     "postcss-cli": "^6.0.1",
     "pug": "^2.0.3",
@@ -104,7 +104,7 @@
     "stylelint": "^9.8.0",
     "stylelint-config-recommended-scss": "^3.2.0",
     "stylelint-config-standard": "^18.2.0",
-    "stylelint-order": "^1.0.0",
+    "stylelint-order": "^2.0.0",
     "stylelint-scss": "^3.4.0"
   },
   "engines": {

diff --git a/pug/views/notifications/modals.pug b/pug/views/notifications/modals.pug
@@ -10,22 +10,22 @@ block view
             |  Bootstrap Modals
           .card-body
             // Button trigger modal
-            button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#myModal')
+            button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#myModal')
               | Launch demo modal
-            button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#largeModal')
+            button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#largeModal')
               | Launch large modal
-            button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#smallModal')
+            button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#smallModal')
               | Launch small modal
             hr
-            button.btn.btn-primary(type='button', data-toggle='modal', data-target='#primaryModal')
+            button.btn.btn-primary.mb-1(type='button', data-toggle='modal', data-target='#primaryModal')
               | Primary modal
-            button.btn.btn-success(type='button', data-toggle='modal', data-target='#successModal')
+            button.btn.btn-success.mb-1(type='button', data-toggle='modal', data-target='#successModal')
               | Success modal
-            button.btn.btn-warning(type='button', data-toggle='modal', data-target='#warningModal')
+            button.btn.btn-warning.mb-1(type='button', data-toggle='modal', data-target='#warningModal')
               | Warning modal
-            button.btn.btn-danger(type='button', data-toggle='modal', data-target='#dangerModal')
+            button.btn.btn-danger.mb-1(type='button', data-toggle='modal', data-target='#dangerModal')
               | Danger modal
-            button.btn.btn-info(type='button', data-toggle='modal', data-target='#infoModal')
+            button.btn.btn-info.mb-1(type='button', data-toggle='modal', data-target='#infoModal')
               | Info modal
       // /.col
     // /.row

diff --git a/src/404.html b/src/404.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/500.html b/src/500.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

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.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/base/scrollspy.html b/src/base/scrollspy.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/base/switches.html b/src/base/switches.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/base/tables.html b/src/base/tables.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/base/tabs.html b/src/base/tabs.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/base/tooltips.html b/src/base/tooltips.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/blank.html b/src/blank.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/buttons/brand-buttons.html b/src/buttons/brand-buttons.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/buttons/button-group.html b/src/buttons/button-group.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/buttons/buttons.html b/src/buttons/buttons.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/buttons/dropdowns.html b/src/buttons/dropdowns.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/charts.html b/src/charts.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/colors.html b/src/colors.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/css/style.css b/src/css/style.css
diff --git a/src/css/style.css.map b/src/css/style.css.map
diff --git a/src/css/style.min.css b/src/css/style.min.css
diff --git a/src/css/style.min.css.map b/src/css/style.min.css.map
diff --git a/src/icons/coreui-icons.html b/src/icons/coreui-icons.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)

diff --git a/src/icons/flags.html b/src/icons/flags.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI - Free Bootstrap Admin Template
-* @version v2.1.9
+* @version v2.1.10
 * @link https://coreui.io
 * Copyright (c) 2018 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/license)