Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.stylelintrc4
-rw-r--r--package-lock.json84
-rw-r--r--package.json2
-rw-r--r--scss/_card.scss8
-rw-r--r--scss/_reboot.scss2
-rw-r--r--scss/_spinners.scss4
-rw-r--r--scss/_variables.scss4
-rw-r--r--scss/forms/_form-check.scss2
-rw-r--r--scss/mixins/_border-radius.scss2
-rw-r--r--scss/mixins/_container.scss4
-rw-r--r--scss/mixins/_grid.scss10
-rw-r--r--scss/mixins/_transition.scss2
12 files changed, 91 insertions, 37 deletions
diff --git a/.stylelintrc b/.stylelintrc
index 64e0184fdb..15e5765ea1 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -3,10 +3,10 @@
"stylelint-config-twbs-bootstrap/scss"
],
"rules": {
- "function-blacklist": [
+ "function-disallowed-list": [
"calc"
],
- "property-blacklist": [
+ "property-disallowed-list": [
"border-radius",
"border-top-left-radius",
"border-top-right-radius",
diff --git a/package-lock.json b/package-lock.json
index ca0cb7e4a9..2a3c088e3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4629,6 +4629,12 @@
"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
"dev": true
},
+ "fastest-levenshtein": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+ "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+ "dev": true
+ },
"fastq": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
@@ -11060,19 +11066,21 @@
"dev": true
},
"stylelint": {
- "version": "13.6.1",
- "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.6.1.tgz",
- "integrity": "sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==",
+ "version": "13.7.2",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz",
+ "integrity": "sha512-mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg==",
"dev": true,
"requires": {
- "@stylelint/postcss-css-in-js": "^0.37.1",
+ "@stylelint/postcss-css-in-js": "^0.37.2",
"@stylelint/postcss-markdown": "^0.36.1",
- "autoprefixer": "^9.8.0",
+ "autoprefixer": "^9.8.6",
"balanced-match": "^1.0.0",
"chalk": "^4.1.0",
- "cosmiconfig": "^6.0.0",
+ "cosmiconfig": "^7.0.0",
"debug": "^4.1.1",
"execall": "^2.0.0",
+ "fast-glob": "^3.2.4",
+ "fastest-levenshtein": "^1.0.12",
"file-entry-cache": "^5.0.1",
"get-stdin": "^8.0.0",
"global-modules": "^2.0.0",
@@ -11083,18 +11091,16 @@
"import-lazy": "^4.0.0",
"imurmurhash": "^0.1.4",
"known-css-properties": "^0.19.0",
- "leven": "^3.1.0",
- "lodash": "^4.17.15",
+ "lodash": "^4.17.20",
"log-symbols": "^4.0.0",
"mathml-tag-names": "^2.1.3",
- "meow": "^7.0.1",
+ "meow": "^7.1.1",
"micromatch": "^4.0.2",
"normalize-selector": "^0.2.0",
"postcss": "^7.0.32",
"postcss-html": "^0.36.0",
"postcss-less": "^3.1.4",
"postcss-media-query-parser": "^0.2.3",
- "postcss-reporter": "^6.0.1",
"postcss-resolve-nested-selector": "^0.1.1",
"postcss-safe-parser": "^4.0.2",
"postcss-sass": "^0.4.4",
@@ -11110,7 +11116,7 @@
"style-search": "^0.1.0",
"sugarss": "^2.0.0",
"svg-tags": "^1.0.0",
- "table": "^5.4.6",
+ "table": "^6.0.1",
"v8-compile-cache": "^2.1.1",
"write-file-atomic": "^3.0.3"
},
@@ -11125,6 +11131,12 @@
"color-convert": "^2.0.1"
}
},
+ "astral-regex": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+ "dev": true
+ },
"braces": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
@@ -11159,13 +11171,26 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
+ "cosmiconfig": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+ "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+ "dev": true,
+ "requires": {
+ "@types/parse-json": "^4.0.0",
+ "import-fresh": "^3.2.1",
+ "parse-json": "^5.0.0",
+ "path-type": "^4.0.0",
+ "yaml": "^1.10.0"
+ }
+ },
"debug": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
- "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+ "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
"dev": true,
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"emoji-regex": {
@@ -11244,6 +11269,12 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
+ "path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+ "dev": true
+ },
"resolve-from": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -11256,6 +11287,17 @@
"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
"dev": true
},
+ "slice-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+ "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.0.0",
+ "astral-regex": "^2.0.0",
+ "is-fullwidth-code-point": "^3.0.0"
+ }
+ },
"string-width": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -11276,6 +11318,18 @@
"has-flag": "^4.0.0"
}
},
+ "table": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/table/-/table-6.0.3.tgz",
+ "integrity": "sha512-8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw==",
+ "dev": true,
+ "requires": {
+ "ajv": "^6.12.4",
+ "lodash": "^4.17.20",
+ "slice-ansi": "^4.0.0",
+ "string-width": "^4.2.0"
+ }
+ },
"to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
diff --git a/package.json b/package.json
index f2eb09a2ea..36cdcdd3f0 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
"rollup-plugin-istanbul": "^2.0.1",
"shelljs": "^0.8.4",
"sirv-cli": "^1.0.6",
- "stylelint": "^13.6.1",
+ "stylelint": "^13.7.2",
"stylelint-config-twbs-bootstrap": "^2.1.0",
"terser": "^5.1.0",
"vnu-jar": "20.6.30"
diff --git a/scss/_card.scss b/scss/_card.scss
index 7db0de2212..a526ec143c 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -185,12 +185,12 @@
.card-img-top,
.card-header {
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-top-right-radius: 0;
}
.card-img-bottom,
.card-footer {
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-bottom-right-radius: 0;
}
}
@@ -200,12 +200,12 @@
.card-img-top,
.card-header {
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-top-left-radius: 0;
}
.card-img-bottom,
.card-footer {
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-bottom-left-radius: 0;
}
}
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 7da6e30444..223adfd86e 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -402,7 +402,7 @@ label {
// See https://github.com/twbs/bootstrap/issues/24093
button {
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-radius: 0;
}
diff --git a/scss/_spinners.scss b/scss/_spinners.scss
index e8e4c044eb..9e083eae1b 100644
--- a/scss/_spinners.scss
+++ b/scss/_spinners.scss
@@ -13,7 +13,7 @@
vertical-align: text-bottom;
border: $spinner-border-width solid currentColor;
border-right-color: transparent;
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-radius: 50%;
animation: spinner-border $spinner-animation-speed linear infinite;
}
@@ -44,7 +44,7 @@
height: $spinner-height;
vertical-align: text-bottom;
background-color: currentColor;
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-radius: 50%;
opacity: 0;
animation: spinner-grow $spinner-animation-speed linear infinite;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3cac710d75..e4d844ffd3 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -376,7 +376,7 @@ $transition-base: all .2s ease-in-out !default;
$transition-fade: opacity .15s linear !default;
$transition-collapse: height .35s ease !default;
-// stylelint-disable function-blacklist
+// stylelint-disable function-disallowed-list
// scss-docs-start aspect-ratios
$aspect-ratios: (
"1x1": 100%,
@@ -385,7 +385,7 @@ $aspect-ratios: (
"21x9": calc(9 / 21 * 100%)
) !default;
// scss-docs-end aspect-ratios
-// stylelint-enable function-blacklist
+// stylelint-enable function-disallowed-list
// Typography
//
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index f1635780fe..84e3e57d1f 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -33,7 +33,7 @@
}
&[type="radio"] {
- // stylelint-disable-next-line property-blacklist
+ // stylelint-disable-next-line property-disallowed-list
border-radius: $form-check-radio-border-radius;
}
diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
index 3163fc0e79..70f5720441 100644
--- a/scss/mixins/_border-radius.scss
+++ b/scss/mixins/_border-radius.scss
@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist
+// stylelint-disable property-disallowed-list
// Single side border-radius
// Helper function to replace negative values with 0
diff --git a/scss/mixins/_container.scss b/scss/mixins/_container.scss
index cc2a3e3ebd..f391c220cb 100644
--- a/scss/mixins/_container.scss
+++ b/scss/mixins/_container.scss
@@ -4,8 +4,8 @@
--bs-gutter-x: #{$gutter};
width: 100%;
- padding-right: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-blacklist
- padding-left: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-blacklist
+ padding-right: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-disallowed-list
+ padding-left: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-disallowed-list
margin-right: auto;
margin-left: auto;
}
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 9e9bba3ccb..a229199dd3 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -7,9 +7,9 @@
--bs-gutter-y: 0;
display: flex;
flex-wrap: wrap;
- margin-top: calc(var(--bs-gutter-y) * -1); // stylelint-disable-line function-blacklist
- margin-right: calc(var(--bs-gutter-x) / -2); // stylelint-disable-line function-blacklist
- margin-left: calc(var(--bs-gutter-x) / -2); // stylelint-disable-line function-blacklist
+ margin-top: calc(var(--bs-gutter-y) * -1); // stylelint-disable-line function-disallowed-list
+ margin-right: calc(var(--bs-gutter-x) / -2); // stylelint-disable-line function-disallowed-list
+ margin-left: calc(var(--bs-gutter-x) / -2); // stylelint-disable-line function-disallowed-list
}
@mixin make-col-ready($gutter: $grid-gutter-width) {
@@ -21,8 +21,8 @@
flex-shrink: 0;
width: 100%;
max-width: 100%; // Prevent `.col-auto`, `.col` (& responsive variants) from breaking out the grid
- padding-right: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-blacklist
- padding-left: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-blacklist
+ padding-right: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-disallowed-list
+ padding-left: calc(var(--bs-gutter-x) / 2); // stylelint-disable-line function-disallowed-list
margin-top: var(--bs-gutter-y);
}
diff --git a/scss/mixins/_transition.scss b/scss/mixins/_transition.scss
index bf4c00a64b..d437f6d8f4 100644
--- a/scss/mixins/_transition.scss
+++ b/scss/mixins/_transition.scss
@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist
+// stylelint-disable property-disallowed-list
@mixin transition($transition...) {
@if length($transition) == 0 {
$transition: $transition-base;