rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'main' into fix-function-this-reference

Browse Source
This commit is contained in:
Nathan Sarang-Walters 2024-02-23 13:58:19 -08:00 committed by GitHub
commit 8c85eb76e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package-lock.json generated
View File

@ -40,7 +40,7 @@
"find-unused-sass-variables": "^5.0.0",
"globby": "^11.1.0",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.119.0",
"hugo-bin": "^0.120.2",
"ip": "^2.0.1",
"jasmine": "^5.1.0",
"jquery": "^3.7.1",
@ -53,7 +53,7 @@
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"karma-rollup-preprocessor": "7.0.7",
"lockfile-lint": "^4.13.1",
"lockfile-lint": "^4.13.2",
"nodemon": "^3.0.3",
"npm-run-all2": "^6.1.2",
"postcss": "^8.4.35",
@ -61,7 +61,7 @@
"rollup": "^4.12.0",
"rollup-plugin-istanbul": "^5.0.0",
"rtlcss": "^4.1.1",
"sass": "^1.71.0",
"sass": "^1.71.1",
"sass-true": "^7.0.1",
"shelljs": "^0.8.5",
"stylelint": "^16.2.1",
@ -6316,9 +6316,9 @@
}
},
"node_modules/hugo-bin": {
"version": "0.119.0",
"resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.119.0.tgz",
"integrity": "sha512-RnjlxHKdOjo7i7yRX/001t53142tC9NTa5JVrnPCTpX2kNQQCz5XdI/WWX7emf0dNkxipj55Z58EsA2ft9W16g==",
"version": "0.120.2",
"resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.120.2.tgz",
"integrity": "sha512-I2Xc84CLtDKh8jBQym8J1PdwuF0wKBbcQzNoqdjMNnae0RhkWOWOm3tV2CsQX9a1eWsRvBt1QoCLeNw8v0C0Ig==",
"dev": true,
"funding": [
{
@ -7622,9 +7622,9 @@
}
},
"node_modules/lockfile-lint": {
"version": "4.13.1",
"resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.13.1.tgz",
"integrity": "sha512-JUOsgO2wUGSvo5UzVAj4z0IwQkRLgDY3OnsusnWy/uCUzpG9PDUJtMn718KjkSmnmmxwXqqWlc/Fvho1GaEFGg==",
"version": "4.13.2",
"resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.13.2.tgz",
"integrity": "sha512-yeg0vJ3NjC6OVMZtC+nSLLavu/e8LE5FZp9u0Itqyt7I0gYYCgGxAsJV3TJ7WtaJd4PahineJvHqSk/4sqzU8w==",
"dev": true,
"dependencies": {
"cosmiconfig": "^8.2.0",
@ -9795,9 +9795,9 @@
"dev": true
},
"node_modules/sass": {
"version": "1.71.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz",
"integrity": "sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==",
"version": "1.71.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
"integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
@ -16223,9 +16223,9 @@
}
},
"hugo-bin": {
"version": "0.119.0",
"resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.119.0.tgz",
"integrity": "sha512-RnjlxHKdOjo7i7yRX/001t53142tC9NTa5JVrnPCTpX2kNQQCz5XdI/WWX7emf0dNkxipj55Z58EsA2ft9W16g==",
"version": "0.120.2",
"resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.120.2.tgz",
"integrity": "sha512-I2Xc84CLtDKh8jBQym8J1PdwuF0wKBbcQzNoqdjMNnae0RhkWOWOm3tV2CsQX9a1eWsRvBt1QoCLeNw8v0C0Ig==",
"dev": true,
"requires": {
"@xhmikosr/bin-wrapper": "^12.0.0",
@ -17173,9 +17173,9 @@
}
},
"lockfile-lint": {
"version": "4.13.1",
"resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.13.1.tgz",
"integrity": "sha512-JUOsgO2wUGSvo5UzVAj4z0IwQkRLgDY3OnsusnWy/uCUzpG9PDUJtMn718KjkSmnmmxwXqqWlc/Fvho1GaEFGg==",
"version": "4.13.2",
"resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.13.2.tgz",
"integrity": "sha512-yeg0vJ3NjC6OVMZtC+nSLLavu/e8LE5FZp9u0Itqyt7I0gYYCgGxAsJV3TJ7WtaJd4PahineJvHqSk/4sqzU8w==",
"dev": true,
"requires": {
"cosmiconfig": "^8.2.0",
@ -18650,9 +18650,9 @@
"dev": true
},
"sass": {
"version": "1.71.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz",
"integrity": "sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==",
"version": "1.71.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
"integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",

6
package.json
View File

@ -124,7 +124,7 @@
"find-unused-sass-variables": "^5.0.0",
"globby": "^11.1.0",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.119.0",
"hugo-bin": "^0.120.2",
"ip": "^2.0.1",
"jasmine": "^5.1.0",
"jquery": "^3.7.1",
@ -137,7 +137,7 @@
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"karma-rollup-preprocessor": "7.0.7",
"lockfile-lint": "^4.13.1",
"lockfile-lint": "^4.13.2",
"nodemon": "^3.0.3",
"npm-run-all2": "^6.1.2",
"postcss": "^8.4.35",
@ -145,7 +145,7 @@
"rollup": "^4.12.0",
"rollup-plugin-istanbul": "^5.0.0",
"rtlcss": "^4.1.1",
"sass": "^1.71.0",
"sass": "^1.71.1",
"sass-true": "^7.0.1",
"shelljs": "^0.8.5",
"stylelint": "^16.2.1",

13
scss/_accordion.scss
View File

@ -134,17 +134,12 @@
&:last-child { border-bottom: 0; }
// stylelint-disable selector-max-class
> .accordion-header .accordion-button {
&,
&.collapsed {
@include border-radius(0);
}
}
// stylelint-enable selector-max-class
> .accordion-collapse {
> .accordion-collapse,
> .accordion-header .accordion-button,
> .accordion-header .accordion-button.collapsed {
@include border-radius(0);
}
// stylelint-enable selector-max-class
}
}