From 5241b988c0156dbcc2c6bdaeb29967141bea567d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Sun, 19 Feb 2023 09:34:15 +0100 Subject: [PATCH 01/30] Bump Chart.js from 2.9.4 to 4.2.1 in dashboard examples (#38071) * Bump Chart.js from 2.9.4 to 4.2.1 in dashboard examples * Rollback myChart var modification * Add some padding between tooltip color and text --------- Co-authored-by: XhmikosR --- .../docs/5.3/examples/dashboard-rtl/dashboard.js | 16 +++++++--------- .../docs/5.3/examples/dashboard-rtl/index.html | 4 ++-- .../docs/5.3/examples/dashboard/dashboard.js | 16 +++++++--------- .../docs/5.3/examples/dashboard/index.html | 4 ++-- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/site/content/docs/5.3/examples/dashboard-rtl/dashboard.js b/site/content/docs/5.3/examples/dashboard-rtl/dashboard.js index 96e0895bf2..d278c628bd 100644 --- a/site/content/docs/5.3/examples/dashboard-rtl/dashboard.js +++ b/site/content/docs/5.3/examples/dashboard-rtl/dashboard.js @@ -38,15 +38,13 @@ }] }, options: { - scales: { - yAxes: [{ - ticks: { - beginAtZero: false - } - }] - }, - legend: { - display: false + plugins: { + legend: { + display: false + }, + tooltip: { + boxPadding: 3 + } } } }) diff --git a/site/content/docs/5.3/examples/dashboard-rtl/index.html b/site/content/docs/5.3/examples/dashboard-rtl/index.html index 699586c7fa..9b2eb8caf7 100644 --- a/site/content/docs/5.3/examples/dashboard-rtl/index.html +++ b/site/content/docs/5.3/examples/dashboard-rtl/index.html @@ -7,8 +7,8 @@ extra_css: extra_js: - src: "https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity: "sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" - - src: "https://cdn.jsdelivr.net/npm/chart.js@2.9.4/dist/Chart.min.js" - integrity: "sha384-zNy6FEbO50N+Cg5wap8IKA4M/ZnLJgzc6w2NqACZaK0u0FXfOWRRJOnQtpZun8ha" + - src: "https://cdn.jsdelivr.net/npm/chart.js@4.2.1/dist/chart.umd.min.js" + integrity: "sha384-gdQErvCNWvHQZj6XZM0dNsAoY4v+j5P1XDpNkcM3HJG1Yx04ecqIHk7+4VBOCHOG" - src: "dashboard.js" --- diff --git a/site/content/docs/5.3/examples/dashboard/dashboard.js b/site/content/docs/5.3/examples/dashboard/dashboard.js index e1379758b2..d190d79616 100644 --- a/site/content/docs/5.3/examples/dashboard/dashboard.js +++ b/site/content/docs/5.3/examples/dashboard/dashboard.js @@ -38,15 +38,13 @@ }] }, options: { - scales: { - yAxes: [{ - ticks: { - beginAtZero: false - } - }] - }, - legend: { - display: false + plugins: { + legend: { + display: false + }, + tooltip: { + boxPadding: 3 + } } } }) diff --git a/site/content/docs/5.3/examples/dashboard/index.html b/site/content/docs/5.3/examples/dashboard/index.html index 6fbf812b13..88ac303ab7 100644 --- a/site/content/docs/5.3/examples/dashboard/index.html +++ b/site/content/docs/5.3/examples/dashboard/index.html @@ -6,8 +6,8 @@ extra_css: extra_js: - src: "https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity: "sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" - - src: "https://cdn.jsdelivr.net/npm/chart.js@2.9.4/dist/Chart.min.js" - integrity: "sha384-zNy6FEbO50N+Cg5wap8IKA4M/ZnLJgzc6w2NqACZaK0u0FXfOWRRJOnQtpZun8ha" + - src: "https://cdn.jsdelivr.net/npm/chart.js@4.2.1/dist/chart.umd.min.js" + integrity: "sha384-gdQErvCNWvHQZj6XZM0dNsAoY4v+j5P1XDpNkcM3HJG1Yx04ecqIHk7+4VBOCHOG" - src: "dashboard.js" --- From d5765906321cc66a89123a3c4273695a4dbf9b5c Mon Sep 17 00:00:00 2001 From: Serhii Babakov Date: Mon, 20 Feb 2023 15:17:08 +0400 Subject: [PATCH 02/30] Fix shadow of .btn-link --- scss/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index adbc4c1943..bb1ae3d840 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -170,7 +170,7 @@ --#{$prefix}btn-disabled-color: #{$btn-link-disabled-color}; --#{$prefix}btn-disabled-border-color: transparent; --#{$prefix}btn-box-shadow: 0 0 0 #000; // Can't use `none` as keyword negates all values when used with multiple shadows - --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($primary), $primary, 15%))}; + --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($link-color), $link-color, 15%))}; text-decoration: $link-decoration; @if $enable-gradients { From 28d9c0ccdd7d104192243815e5a75027044dd146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 17:22:19 +0200 Subject: [PATCH 03/30] Build(deps-dev): Bump sass from 1.58.1 to 1.58.3 (#38100) Bumps [sass](https://github.com/sass/dart-sass) from 1.58.1 to 1.58.3. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.58.1...1.58.3) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3258a39257..e68882082a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "rollup": "^3.15.0", "rollup-plugin-istanbul": "^4.0.0", "rtlcss": "^4.0.0", - "sass": "^1.58.1", + "sass": "^1.58.3", "sass-true": "^7.0.0", "shelljs": "^0.8.5", "stylelint": "^14.16.1", @@ -9316,9 +9316,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.58.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz", - "integrity": "sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==", + "version": "1.58.3", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz", + "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -17683,9 +17683,9 @@ "dev": true }, "sass": { - "version": "1.58.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz", - "integrity": "sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==", + "version": "1.58.3", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz", + "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index d09e04c935..5b15324edf 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "rollup": "^3.15.0", "rollup-plugin-istanbul": "^4.0.0", "rtlcss": "^4.0.0", - "sass": "^1.58.1", + "sass": "^1.58.3", "sass-true": "^7.0.0", "shelljs": "^0.8.5", "stylelint": "^14.16.1", From a6d774c93e4667e8a426a9a4f6644bc1b0bebad8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 17:27:06 +0200 Subject: [PATCH 04/30] Build(deps-dev): Bump rollup from 3.15.0 to 3.17.2 (#38097) Bumps [rollup](https://github.com/rollup/rollup) from 3.15.0 to 3.17.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.15.0...v3.17.2) --- updated-dependencies: - dependency-name: rollup dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e68882082a..3f7a2cf982 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "npm-run-all": "^4.1.5", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", - "rollup": "^3.15.0", + "rollup": "^3.17.2", "rollup-plugin-istanbul": "^4.0.0", "rtlcss": "^4.0.0", "sass": "^1.58.3", @@ -9192,9 +9192,9 @@ } }, "node_modules/rollup": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz", - "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.17.2.tgz", + "integrity": "sha512-qMNZdlQPCkWodrAZ3qnJtvCAl4vpQ8q77uEujVCCbC/6CLB7Lcmvjq7HyiOSnf4fxTT9XgsE36oLHJBH49xjqA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -17611,9 +17611,9 @@ } }, "rollup": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.15.0.tgz", - "integrity": "sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.17.2.tgz", + "integrity": "sha512-qMNZdlQPCkWodrAZ3qnJtvCAl4vpQ8q77uEujVCCbC/6CLB7Lcmvjq7HyiOSnf4fxTT9XgsE36oLHJBH49xjqA==", "dev": true, "requires": { "fsevents": "~2.3.2" diff --git a/package.json b/package.json index 5b15324edf..a3845553bf 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "npm-run-all": "^4.1.5", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", - "rollup": "^3.15.0", + "rollup": "^3.17.2", "rollup-plugin-istanbul": "^4.0.0", "rtlcss": "^4.0.0", "sass": "^1.58.3", From f44feabe16f4a0751428e486da2fd8396a3a16f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Tue, 21 Feb 2023 19:33:52 +0100 Subject: [PATCH 05/30] Tests: remove unnecessary `id`/`aria-labelledby` from collapse unit tests (#38089) --- js/tests/unit/collapse.spec.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/js/tests/unit/collapse.spec.js b/js/tests/unit/collapse.spec.js index fa50ad361c..5a4fe1063d 100644 --- a/js/tests/unit/collapse.spec.js +++ b/js/tests/unit/collapse.spec.js @@ -277,25 +277,25 @@ describe('Collapse', () => { return new Promise(resolve => { fixtureEl.innerHTML = [ '
', - '
', + '
', ' ', '
', - '
', + '
', '
', '
', '
', - '
', + '
', ' ', '
', - '
', + '
', '
content
', '
', '
', '
', - '
', + '
', ' ', '
', - '
', + '
', '
content
', '
', '
', @@ -338,12 +338,12 @@ describe('Collapse', () => { fixtureEl.innerHTML = [ '
', '
', - '

', + '

', ' ', '

', - '
', + '
', '
', '