From f07106e604c3bb3d7ea80b91f79378b55218d039 Mon Sep 17 00:00:00 2001 From: Marc Jansing Date: Fri, 18 Dec 2020 06:39:39 +0100 Subject: [PATCH 01/52] Add helpers to utilities bundle (#32324) Adds currently missing utilities classes which are located in scss/helpers to boostrap-utilities dist files. Co-authored-by: XhmikosR --- .bundlewatch.config.json | 4 ++-- scss/bootstrap-utilities.scss | 4 ++-- site/content/docs/5.0/migration.md | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 074066390..da47da480 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -18,11 +18,11 @@ }, { "path": "./dist/css/bootstrap-utilities.css", - "maxSize": "7 kB" + "maxSize": "7.5 kB" }, { "path": "./dist/css/bootstrap-utilities.min.css", - "maxSize": "6.25 kB" + "maxSize": "6.75 kB" }, { "path": "./dist/css/bootstrap.css", diff --git a/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss index 8d96cf9d7..265aa890a 100644 --- a/scss/bootstrap-utilities.scss +++ b/scss/bootstrap-utilities.scss @@ -6,13 +6,13 @@ */ // Configuration - @import "functions"; @import "variables"; @import "mixins"; @import "utilities"; +// Helpers +@import "helpers"; // Utilities - @import "utilities/api"; diff --git a/site/content/docs/5.0/migration.md b/site/content/docs/5.0/migration.md index b2e08c3ab..1a442d516 100644 --- a/site/content/docs/5.0/migration.md +++ b/site/content/docs/5.0/migration.md @@ -11,7 +11,10 @@ toc: true ### Sass +#### Utilities + - Extended the `.visually-hidden-focusable` helper to also work on containers, using `:focus-within`. +- `bootstrap-utilities.css` now also includes our helpers. Helpers don't need to be imported in custom builds anymore. - Extended form validation states customization capabilities. Added three new optional parameters to the `form-validation-state` mixin: `tooltip-color`, `tooltip-bg-color`, `focus-box-shadow`. These parameters can be set in the `$form-validation-states` map. [See #31757](https://github.com/twbs/bootstrap/pull/31757). ### JavaScript From 517446069a60daddaf5e53651661851f9b44e9a0 Mon Sep 17 00:00:00 2001 From: Siju Samson Date: Fri, 18 Dec 2020 13:49:30 +0530 Subject: [PATCH 02/52] docs: Fix popover example showing above navbar (#32445) Co-authored-by: XhmikosR --- site/assets/scss/_subnav.scss | 2 +- site/assets/scss/_variables.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/site/assets/scss/_subnav.scss b/site/assets/scss/_subnav.scss index 8377ff423..8979aa3cd 100644 --- a/site/assets/scss/_subnav.scss +++ b/site/assets/scss/_subnav.scss @@ -1,7 +1,7 @@ .bd-subnavbar { // The position and z-index are needed for the dropdown to stay on top of the content position: relative; - z-index: $zindex-sticky; + z-index: $bd-navbar-zindex; background-color: rgba($white, .95); box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .05), inset 0 -1px 0 rgba(0, 0, 0, .15); diff --git a/site/assets/scss/_variables.scss b/site/assets/scss/_variables.scss index 110600260..6e1ae2efd 100644 --- a/site/assets/scss/_variables.scss +++ b/site/assets/scss/_variables.scss @@ -11,3 +11,6 @@ $bd-warning: #f0ad4e; $bd-danger: #d9534f; $dropdown-active-icon: url("data:image/svg+xml,"); $sidebar-collapse-icon: url("data:image/svg+xml,"); + +// Higher than core's $zindex-tooltip, which is 1070 +$bd-navbar-zindex: 1080; From 66f323af7015346ef401f241a8082a27d37e1d67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Dec 2020 15:11:07 +0200 Subject: [PATCH 03/52] Bump eslint-plugin-unicorn from 23.0.0 to 24.0.0 (#32516) * Bump eslint-plugin-unicorn from 23.0.0 to 24.0.0 Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 23.0.0 to 24.0.0. - [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases) - [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v23.0.0...v24.0.0) Signed-off-by: dependabot[bot] * Update karma.conf.js Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: XhmikosR --- js/tests/karma.conf.js | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index d0dd8bdd9..38c7003bb 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -59,7 +59,7 @@ const conf = { colors: true, autoWatch: false, singleRun: true, - concurrency: Infinity, + concurrency: Number.POSITIVE_INFINITY, client: { clearContext: false }, diff --git a/package-lock.json b/package-lock.json index af1b0d0b9..d94ad7929 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4031,9 +4031,9 @@ } }, "eslint-plugin-unicorn": { - "version": "23.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-23.0.0.tgz", - "integrity": "sha512-Vabo3cjl6cjyhcf+76CdQEY6suOFzK0Xh3xo0uL9VDYrDJP5+B6PjV0tHTYm82WZmFWniugFJM3ywHSNYTi/ZQ==", + "version": "24.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-24.0.0.tgz", + "integrity": "sha512-NfLjIZas/ZUwc3S+pUtbTRqgCkODxPEkJBJ5ZR8wIu90BmX4jmXp10hoOZMScR2CR1NYTtrx0OX4BQvBnbzZzA==", "dev": true, "requires": { "ci-info": "^2.0.0", @@ -4048,7 +4048,7 @@ "regexp-tree": "^0.1.21", "reserved-words": "^0.1.2", "safe-regex": "^2.1.1", - "semver": "^7.3.2" + "semver": "^7.3.4" }, "dependencies": { "safe-regex": { diff --git a/package.json b/package.json index 11e06e03f..16d2fc935 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "eslint": "^7.15.0", "eslint-config-xo": "^0.33.1", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-unicorn": "^23.0.0", + "eslint-plugin-unicorn": "^24.0.0", "find-unused-sass-variables": "^3.0.0", "glob": "^7.1.6", "hammer-simulator": "0.0.1", From 58ab1c2cd53b51b57e425e4f4926b9d29de424be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Fri, 18 Dec 2020 16:22:16 +0100 Subject: [PATCH 04/52] test(carousel): french word in the wild (#32528) --- js/tests/unit/carousel.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js index 07b8fc311..0286762fa 100644 --- a/js/tests/unit/carousel.spec.js +++ b/js/tests/unit/carousel.spec.js @@ -905,7 +905,7 @@ describe('Carousel', () => { }) describe('to', () => { - it('should go directement to the provided index', done => { + it('should go directly to the provided index', done => { fixtureEl.innerHTML = [ '