Skip to content

Commit 83b06ab

Browse files
xidedixxidedix
authored
Merge pull request #448 from coreui/dev-vnext
v2.1.10
2 parents d6d0349 + 17332a9 commit 83b06ab

Some content is hidden

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

66 files changed

+108
-102
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v2.1.10
2+
- fix: update `nodemon` to `1.18.7` (remove vulnerability)
3+
- update: `@coreui/coreui` to `^2.1.3`
4+
- update: `stylelint-order` to `^2.0.0`
5+
- refactor(modals): buttons margin
6+
17
## v2.1.9
28
- fix: devDependencies security issues (event-stream, flatmap-stream)
39
- chore: dependencies update

‎package-lock.json

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

‎package.json

+4-4
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.9",
3+
"version": "2.1.10",
44
"description": "Free Bootstrap Admin Template",
55
"keywords": [
66
"admin",
@@ -63,7 +63,7 @@
6363
"watch-pug": "nodemon -e pug -x \"npm run pug\""
6464
},
6565
"dependencies": {
66-
"@coreui/coreui": "^2.1.2",
66+
"@coreui/coreui": "^2.1.3",
6767
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
6868
"@coreui/icons": "0.3.0",
6969
"bootstrap": "4.1.3",
@@ -95,7 +95,7 @@
9595
"foreach-cli": "^1.8.1",
9696
"js-beautify": "^1.8.8",
9797
"node-sass": "^4.10.0",
98-
"nodemon": "^1.18.6",
98+
"nodemon": "^1.18.7",
9999
"npm-run-all": "^4.1.5",
100100
"postcss-cli": "^6.0.1",
101101
"pug": "^2.0.3",
@@ -104,7 +104,7 @@
104104
"stylelint": "^9.8.0",
105105
"stylelint-config-recommended-scss": "^3.2.0",
106106
"stylelint-config-standard": "^18.2.0",
107-
"stylelint-order": "^1.0.0",
107+
"stylelint-order": "^2.0.0",
108108
"stylelint-scss": "^3.4.0"
109109
},
110110
"engines": {

‎pug/views/notifications/modals.pug

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ block view
1010
| Bootstrap Modals
1111
.card-body
1212
// Button trigger modal
13-
button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#myModal')
13+
button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#myModal')
1414
| Launch demo modal
15-
button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#largeModal')
15+
button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#largeModal')
1616
| Launch large modal
17-
button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#smallModal')
17+
button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#smallModal')
1818
| Launch small modal
1919
hr
20-
button.btn.btn-primary(type='button', data-toggle='modal', data-target='#primaryModal')
20+
button.btn.btn-primary.mb-1(type='button', data-toggle='modal', data-target='#primaryModal')
2121
| Primary modal
22-
button.btn.btn-success(type='button', data-toggle='modal', data-target='#successModal')
22+
button.btn.btn-success.mb-1(type='button', data-toggle='modal', data-target='#successModal')
2323
| Success modal
24-
button.btn.btn-warning(type='button', data-toggle='modal', data-target='#warningModal')
24+
button.btn.btn-warning.mb-1(type='button', data-toggle='modal', data-target='#warningModal')
2525
| Warning modal
26-
button.btn.btn-danger(type='button', data-toggle='modal', data-target='#dangerModal')
26+
button.btn.btn-danger.mb-1(type='button', data-toggle='modal', data-target='#dangerModal')
2727
| Danger modal
28-
button.btn.btn-info(type='button', data-toggle='modal', data-target='#infoModal')
28+
button.btn.btn-info.mb-1(type='button', data-toggle='modal', data-target='#infoModal')
2929
| Info modal
3030
// /.col
3131
// /.row

‎src/404.html

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

‎src/500.html

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

‎src/base/breadcrumb.html

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

‎src/base/cards.html

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

‎src/base/carousel.html

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

‎src/base/collapse.html

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

‎src/base/forms.html

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

‎src/base/jumbotron.html

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

‎src/base/list-group.html

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

‎src/base/navs.html

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

‎src/base/pagination.html

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

‎src/base/popovers.html

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

‎src/base/progress.html

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

‎src/base/scrollspy.html

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

‎src/base/switches.html

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

‎src/base/tables.html

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

‎src/base/tabs.html

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

‎src/base/tooltips.html

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

‎src/blank.html

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

‎src/buttons/brand-buttons.html

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

‎src/buttons/button-group.html

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

‎src/buttons/buttons.html

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

‎src/buttons/dropdowns.html

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

‎src/charts.html

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

‎src/colors.html

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

‎src/css/style.css

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

‎src/css/style.css.map

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

‎src/css/style.min.css

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

‎src/css/style.min.css.map

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

‎src/icons/coreui-icons.html

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

‎src/icons/flags.html

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

0 commit comments

Comments
 (0)