From aaf99e464b37af9d3c97a3375738dd79777b8c9b Mon Sep 17 00:00:00 2001 From: xidedix Date: Tue, 27 Nov 2018 13:02:30 +0100 Subject: [PATCH 1/3] refactor(modals): buttons margin --- pug/views/notifications/modals.pug | 16 ++++++++-------- src/notifications/modals.html | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pug/views/notifications/modals.pug b/pug/views/notifications/modals.pug index 1193d8713..cdd7702b5 100644 --- 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/notifications/modals.html b/src/notifications/modals.html index e1435fec5..dafd1082a 100644 --- a/src/notifications/modals.html +++ b/src/notifications/modals.html @@ -368,15 +368,15 @@ Bootstrap Modals
- - - + + +
- - - - - + + + + +
From 58079a1a259d9425974c6f15ef6f7fafaf16c34f Mon Sep 17 00:00:00 2001 From: xidedix Date: Tue, 27 Nov 2018 13:05:45 +0100 Subject: [PATCH 2/3] chore: dependencies update - fix: update `nodemon` to `1.18.7` (remove vulnerability) - update: `@coreui/coreui` to `^2.1.3` - update: `stylelint-order` to `^2.0.0` --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c82938e66..d4cec9f71 100644 --- a/package.json +++ b/package.json @@ -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": { From 17332a9700449c0b8590674eb5941db556160dcd Mon Sep 17 00:00:00 2001 From: xidedix Date: Tue, 27 Nov 2018 13:12:55 +0100 Subject: [PATCH 3/3] Ship: v2.1.10 --- CHANGELOG.md | 6 +++++ package-lock.json | 24 +++++++++---------- package.json | 2 +- src/404.html | 2 +- src/500.html | 2 +- src/base/breadcrumb.html | 2 +- src/base/cards.html | 2 +- src/base/carousel.html | 2 +- src/base/collapse.html | 2 +- src/base/forms.html | 2 +- src/base/jumbotron.html | 2 +- src/base/list-group.html | 2 +- src/base/navs.html | 2 +- src/base/pagination.html | 2 +- src/base/popovers.html | 2 +- src/base/progress.html | 2 +- src/base/scrollspy.html | 2 +- src/base/switches.html | 2 +- src/base/tables.html | 2 +- src/base/tabs.html | 2 +- src/base/tooltips.html | 2 +- src/blank.html | 2 +- src/buttons/brand-buttons.html | 2 +- src/buttons/button-group.html | 2 +- src/buttons/buttons.html | 2 +- src/buttons/dropdowns.html | 2 +- src/charts.html | 2 +- src/colors.html | 2 +- src/css/style.css | 2 +- src/css/style.css.map | 2 +- src/css/style.min.css | 2 +- src/css/style.min.css.map | 2 +- src/icons/coreui-icons.html | 2 +- src/icons/flags.html | 2 +- src/icons/font-awesome.html | 2 +- src/icons/simple-line-icons.html | 2 +- src/index.html | 2 +- src/js/charts.js | 2 +- src/js/charts.js.map | 2 +- src/js/colors.js | 2 +- src/js/colors.js.map | 2 +- src/js/main.js | 2 +- src/js/main.js.map | 2 +- src/js/popovers.js | 2 +- src/js/popovers.js.map | 2 +- src/js/src/charts.js | 2 +- src/js/src/colors.js | 2 +- src/js/src/main.js | 2 +- src/js/src/popovers.js | 2 +- src/js/src/tooltips.js | 2 +- src/js/src/widgets.js | 2 +- src/js/tooltips.js | 2 +- src/js/tooltips.js.map | 2 +- src/js/widgets.js | 2 +- src/js/widgets.js.map | 2 +- src/login.html | 2 +- src/notifications/alerts.html | 2 +- src/notifications/badge.html | 2 +- src/notifications/modals.html | 2 +- src/register.html | 2 +- src/scss/vendors/pace-progress/pace.scss | 14 +++++------ src/typography.html | 2 +- src/vendors/pace-progress/css/pace.css.map | 4 ++-- .../pace-progress/css/pace.min.css.map | 4 ++-- src/widgets.html | 2 +- 65 files changed, 89 insertions(+), 83 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efc5a9e13..b825be2d4 100644 --- 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 index b690c14b0..4a88e21b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-bootstrap-admin-template", - "version": "2.1.9", + "version": "2.1.10", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -780,9 +780,9 @@ } }, "@coreui/coreui": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-2.1.2.tgz", - "integrity": "sha512-AjTKWjw8RCriP4Na1IeXFilXUv5fTS10G6EWj/E52pZeHqlO/WA9YSp4cbVVlJ3rasPz3vSs8wm9afdo1XRxRA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-2.1.3.tgz", + "integrity": "sha512-dIsJNcCDYHwPQ3uf+0uOSgs/ZLhwPSWLCBHNsWAYdncXecJC0Hw12PkJPFsAeKmCdMKOVip3CPy8Ul3sC2vPgw==", "requires": { "@babel/polyfill": "^7.0.0", "@coreui/coreui-plugin-npm-postinstall": "^1.0.2", @@ -6263,16 +6263,16 @@ } }, "nodemon": { - "version": "1.18.6", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.6.tgz", - "integrity": "sha512-4pHQNYEZun+IkIC2jCaXEhkZnfA7rQe73i8RkdRyDJls/K+WxR7IpI5uNUsAvQ0zWvYcCDNGD+XVtw2ZG86/uQ==", + "version": "1.18.7", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.7.tgz", + "integrity": "sha512-xuC1V0F5EcEyKQ1VhHYD13owznQbUw29JKvZ8bVH7TmuvVNHvvbp9pLgE4PjTMRJVe0pJ8fGRvwR2nMiosIsPQ==", "dev": true, "requires": { "chokidar": "^2.0.4", "debug": "^3.1.0", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "pstree.remy": "^1.1.0", + "pstree.remy": "^1.1.2", "semver": "^5.5.0", "supports-color": "^5.2.0", "touch": "^3.1.0", @@ -9210,14 +9210,14 @@ } }, "stylelint-order": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-1.0.0.tgz", - "integrity": "sha512-2IVM8GzeKIDQDTETNdmgX99ywGrb7OqFWkniCw7QLqS/xONPGMLY/xAQnvGcUS3oBSo8znsoshsWVBqPz2Kv4Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-2.0.0.tgz", + "integrity": "sha512-rGmvP5zSCxvmBYP8DgzmdMhMMM+degsQCXrzYDmqPmeyU2bWmQTt2mH157Svj0WwHQn1LG9aQHdvKZfpfg2t4A==", "dev": true, "requires": { "lodash": "^4.17.10", "postcss": "^7.0.2", - "postcss-sorting": "^4.0.0" + "postcss-sorting": "^4.0.1" } }, "stylelint-scss": { diff --git a/package.json b/package.json index d4cec9f71..f912a321d 100644 --- 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", diff --git a/src/404.html b/src/404.html index 3a3dd1444..e66899e4c 100644 --- a/src/404.html +++ b/src/404.html @@ -1,7 +1,7 @@