Bootstrap v5.0.1

Also update devDependencies and bootstrap.scss.
This commit is contained in:
Alan Orth 2021-05-25 21:07:34 +03:00
parent 2a60888705
commit f5835d6391
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
3 changed files with 54 additions and 50 deletions

93
package-lock.json generated
View File

@ -8,9 +8,9 @@
"version": "0.0.1", "version": "0.0.1",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"devDependencies": { "devDependencies": {
"bootstrap": "^5.0.0-beta2", "bootstrap": "^5.0.1",
"clean-css-cli": "^4.3.0", "clean-css-cli": "^5.3.0",
"sass": "^1.32.7" "sass": "^1.32.13"
} }
}, },
"node_modules/@popperjs/core": { "node_modules/@popperjs/core": {
@ -53,16 +53,16 @@
} }
}, },
"node_modules/bootstrap": { "node_modules/bootstrap": {
"version": "5.0.0-beta3", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz",
"integrity": "sha512-0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg==", "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==",
"dev": true, "dev": true,
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/bootstrap" "url": "https://opencollective.com/bootstrap"
}, },
"peerDependencies": { "peerDependencies": {
"@popperjs/core": "^2.9.1" "@popperjs/core": "^2.9.2"
} }
}, },
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
@ -109,39 +109,42 @@
} }
}, },
"node_modules/clean-css": { "node_modules/clean-css": {
"version": "4.2.3", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
"integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
}, },
"engines": { "engines": {
"node": ">= 4.0" "node": ">= 10.0"
} }
}, },
"node_modules/clean-css-cli": { "node_modules/clean-css-cli": {
"version": "4.3.0", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.3.0.tgz", "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.0.tgz",
"integrity": "sha512-8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q==", "integrity": "sha512-Jri2KVAcan/Y1JuEDo1rUlm3vUoGvMKSOpIL2YEPgalksvoGur/yL2KbtMF2dPs2VlMVj1afzp76Vu0KjxKfvA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"clean-css": "^4.2.1", "clean-css": "^5.1.2",
"commander": "2.x", "commander": "7.x",
"glob": "7.x" "glob": "^7.1.6"
}, },
"bin": { "bin": {
"cleancss": "bin/cleancss" "cleancss": "bin/cleancss"
}, },
"engines": { "engines": {
"node": ">= 4.0" "node": ">= 10.12.0"
} }
}, },
"node_modules/commander": { "node_modules/commander": {
"version": "2.20.3", "version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true "dev": true,
"engines": {
"node": ">= 10"
}
}, },
"node_modules/concat-map": { "node_modules/concat-map": {
"version": "0.0.1", "version": "0.0.1",
@ -335,12 +338,12 @@
} }
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.32.8", "version": "1.34.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
"integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==", "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=3.0.0 <4.0.0"
}, },
"bin": { "bin": {
"sass": "sass.js" "sass": "sass.js"
@ -408,9 +411,9 @@
"dev": true "dev": true
}, },
"bootstrap": { "bootstrap": {
"version": "5.0.0-beta3", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz",
"integrity": "sha512-0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg==", "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==",
"dev": true, "dev": true,
"requires": {} "requires": {}
}, },
@ -450,29 +453,29 @@
} }
}, },
"clean-css": { "clean-css": {
"version": "4.2.3", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
"integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
"dev": true, "dev": true,
"requires": { "requires": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
} }
}, },
"clean-css-cli": { "clean-css-cli": {
"version": "4.3.0", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.3.0.tgz", "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.3.0.tgz",
"integrity": "sha512-8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q==", "integrity": "sha512-Jri2KVAcan/Y1JuEDo1rUlm3vUoGvMKSOpIL2YEPgalksvoGur/yL2KbtMF2dPs2VlMVj1afzp76Vu0KjxKfvA==",
"dev": true, "dev": true,
"requires": { "requires": {
"clean-css": "^4.2.1", "clean-css": "^5.1.2",
"commander": "2.x", "commander": "7.x",
"glob": "7.x" "glob": "^7.1.6"
} }
}, },
"commander": { "commander": {
"version": "2.20.3", "version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true "dev": true
}, },
"concat-map": { "concat-map": {
@ -618,12 +621,12 @@
} }
}, },
"sass": { "sass": {
"version": "1.32.8", "version": "1.34.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
"integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==", "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=3.0.0 <4.0.0"
} }
}, },
"source-map": { "source-map": {

View File

@ -5,12 +5,12 @@
"author": "Alan Orth", "author": "Alan Orth",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"devDependencies": { "devDependencies": {
"bootstrap": "^5.0.0-beta2", "bootstrap": "^5.0.1",
"clean-css-cli": "^4.3.0", "clean-css-cli": "^5.3.0",
"sass": "^1.32.7" "sass": "^1.32.13"
}, },
"scripts": { "scripts": {
"build:css": "sass --style expanded source/scss/style.scss static/css/style.css.tmp && cleancss --level 1 static/css/style.css.tmp -o static/css/style.min.css", "build:css": "sass --style expanded source/scss/style.scss static/css/style.css.tmp && cleancss -O1 --format breakWith=lf --with-rebase static/css/style.css.tmp -o static/css/style.min.css",
"build": "npm run build:css && npm run clean", "build": "npm run build:css && npm run clean",
"clean": "rm static/css/style.css.tmp static/css/style.css.tmp.map" "clean": "rm static/css/style.css.tmp static/css/style.css.tmp.map"
} }

View File

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v5.0.0-beta3 (https://getbootstrap.com/) * Bootstrap v5.0.1 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc. * Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@ -42,6 +42,7 @@
//@import "../../node_modules/bootstrap/scss/popover"; //@import "../../node_modules/bootstrap/scss/popover";
//@import "../../node_modules/bootstrap/scss/carousel"; //@import "../../node_modules/bootstrap/scss/carousel";
//@import "../../node_modules/bootstrap/scss/spinners"; //@import "../../node_modules/bootstrap/scss/spinners";
@import "../../node_modules/bootstrap/scss/offcanvas";
// Helpers // Helpers
@import "../../node_modules/bootstrap/scss/helpers"; @import "../../node_modules/bootstrap/scss/helpers";