From 413894d4691b5ebb1377fcf5ab8fd3bba49766a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:05:37 +0300 Subject: [PATCH 1/8] Build(deps-dev): Bump hugo-bin from 0.113.0 to 0.114.2 (#39147) Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.113.0 to 0.114.2. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.113.0...v0.114.2) --- updated-dependencies: - dependency-name: hugo-bin 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 05368d9c52..e083f29fc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "find-unused-sass-variables": "^5.0.0", "globby": "^11.1.0", "hammer-simulator": "0.0.1", - "hugo-bin": "^0.113.0", + "hugo-bin": "^0.114.2", "ip": "^2.0.0", "jasmine": "^4.6.0", "jquery": "^3.7.0", @@ -5993,9 +5993,9 @@ } }, "node_modules/hugo-bin": { - "version": "0.113.0", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.113.0.tgz", - "integrity": "sha512-LivqvBvXU/sAydUTH4eMMdsvrUEcJvwJHyWyZX+PfXPyvkCVTUekJcJ0Pg+oYBZrg/nyriyB/xfBFi6JlgTGpg==", + "version": "0.114.2", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.114.2.tgz", + "integrity": "sha512-a7F8wArDACHm10cQnpDe9kljNc3zcsy5uK3myD5TTVU5QZ+75ZYi0IcP9YmQNDg57jos9p0ggOCu510SueH1yw==", "dev": true, "funding": [ { @@ -15686,9 +15686,9 @@ } }, "hugo-bin": { - "version": "0.113.0", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.113.0.tgz", - "integrity": "sha512-LivqvBvXU/sAydUTH4eMMdsvrUEcJvwJHyWyZX+PfXPyvkCVTUekJcJ0Pg+oYBZrg/nyriyB/xfBFi6JlgTGpg==", + "version": "0.114.2", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.114.2.tgz", + "integrity": "sha512-a7F8wArDACHm10cQnpDe9kljNc3zcsy5uK3myD5TTVU5QZ+75ZYi0IcP9YmQNDg57jos9p0ggOCu510SueH1yw==", "dev": true, "requires": { "@xhmikosr/bin-wrapper": "^11.0.2", diff --git a/package.json b/package.json index 7bc9c389f3..cfc36feedd 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "find-unused-sass-variables": "^5.0.0", "globby": "^11.1.0", "hammer-simulator": "0.0.1", - "hugo-bin": "^0.113.0", + "hugo-bin": "^0.114.2", "ip": "^2.0.0", "jasmine": "^4.6.0", "jquery": "^3.7.0", From d07d3a60c520b9c558271068c7ae1e7bce9491b5 Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Tue, 12 Sep 2023 22:04:02 +0200 Subject: [PATCH 2/8] Fix dart-sass deprecation warning (#39030) * Fix dart-sass deprecation warning * Fix wrong percentages --------- Co-authored-by: XhmikosR --- scss/mixins/_grid.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 38e2239fdb..99b1e7dea6 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -56,7 +56,7 @@ @mixin row-cols($count) { > * { flex: 0 0 auto; - width: divide(100%, $count); + width: percentage(divide(1, $count)); } } From fca9c8258b4f860eccdc8a98c7dba3545f26e1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Wed, 13 Sep 2023 07:36:22 +0200 Subject: [PATCH 3/8] Docs: add alternative CDNs section in Getting Started > Download (#39145) Co-authored-by: Mark Otto --- site/content/docs/5.3/getting-started/download.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/content/docs/5.3/getting-started/download.md b/site/content/docs/5.3/getting-started/download.md index a1b8bfd9a7..9c20c6bb22 100644 --- a/site/content/docs/5.3/getting-started/download.md +++ b/site/content/docs/5.3/getting-started/download.md @@ -50,6 +50,14 @@ If you're using our compiled JavaScript and prefer to include Popper separately, ``` +### Alternative CDNs + +We recommend [jsDelivr](https://www.jsdelivr.com/) and use it ourselves in our documentation. However, in some cases—like in some specific countries or environments—you may need to use other CDN providers like [cdnjs](https://cdnjs.com/) or [unpkg](https://unpkg.com/). + +You'll find the same files on these CDN providers, albeit with different URLs. When changing the URLs, you'll also need to update the `integrity` attribute. Tools like [SRI Hash Generator](https://www.srihash.org/) can help you generate the correct values. + +With cdnjs, you can [use this direct Bootstrap package link](https://cdnjs.com/libraries/bootstrap) to copy and paste ready-to-use HTML snippets for each dist file from any version of Bootstrap. + ## Package managers Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a [Sass compiler]({{< docsref "/getting-started/contribute#sass" >}}) and [Autoprefixer](https://github.com/postcss/autoprefixer)** for a setup that matches our official compiled versions. From 4bf483b3b5f486b7d5dffda772d434c74ebae9b4 Mon Sep 17 00:00:00 2001 From: Robert Jones <7176575+RobJonesWeb@users.noreply.github.com> Date: Wed, 13 Sep 2023 06:53:14 +0100 Subject: [PATCH 4/8] Docs: add Discord (community) and Bootstrap subreddit links (#38873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Rob Jones Co-authored-by: Mark Otto Co-authored-by: Julien Déramond --- README.md | 3 ++- site/content/docs/5.3/getting-started/introduction.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c08d4cbad5..6ef0f7d719 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,8 @@ Get updates on Bootstrap's development and chat with the project maintainers and - Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). - Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/). -- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). +- Ask questions and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). +- Discuss, ask questions, and more on [the community Discord](https://discord.gg/bZUvakRU3M) or [Bootstrap subreddit](https://reddit.com/r/bootstrap). - Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)). - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. diff --git a/site/content/docs/5.3/getting-started/introduction.md b/site/content/docs/5.3/getting-started/introduction.md index 22d08c8f70..538d319243 100644 --- a/site/content/docs/5.3/getting-started/introduction.md +++ b/site/content/docs/5.3/getting-started/introduction.md @@ -146,7 +146,8 @@ For improved cross-browser rendering, we use [Reboot]({{< docsref "/content/rebo Stay up-to-date on the development of Bootstrap and reach out to the community with these helpful resources. - Read and subscribe to [The Official Bootstrap Blog]({{< param blog >}}). -- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). +- Ask questions and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). +- Discuss, ask questions, and more on [the community Discord](https://discord.gg/bZUvakRU3M) or [Bootstrap subreddit](https://reddit.com/r/bootstrap). - Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)). - Developers should use the keyword `bootstrap` on packages that modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/search?q=keywords:bootstrap) or similar delivery mechanisms for maximum discoverability. From 4724e7ae9a8f8a63d835b959d3fa349680bcbde3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Wed, 13 Sep 2023 07:59:53 +0200 Subject: [PATCH 5/8] Make form range track background more contrasted (#39095) --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 7706c0f6a5..139462bb44 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1042,7 +1042,7 @@ $form-select-transition: $input-transition !default; $form-range-track-width: 100% !default; $form-range-track-height: .5rem !default; $form-range-track-cursor: pointer !default; -$form-range-track-bg: var(--#{$prefix}tertiary-bg) !default; +$form-range-track-bg: var(--#{$prefix}secondary-bg) !default; $form-range-track-border-radius: 1rem !default; $form-range-track-box-shadow: var(--#{$prefix}box-shadow-inset) !default; From 86672f4222a231bb4a7aa3aabe63a7751c788acd Mon Sep 17 00:00:00 2001 From: Louis-Maxime Piton Date: Wed, 13 Sep 2023 08:17:23 +0200 Subject: [PATCH 6/8] Fix table state rendering for color modes (#39033) --- scss/_variables.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 139462bb44..33ff5c2ff8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -734,7 +734,7 @@ $table-cell-padding-x-sm: .25rem !default; $table-cell-vertical-align: top !default; -$table-color: var(--#{$prefix}body-color) !default; +$table-color: var(--#{$prefix}emphasis-color) !default; $table-bg: var(--#{$prefix}body-bg) !default; $table-accent-bg: transparent !default; @@ -742,17 +742,17 @@ $table-th-font-weight: null !default; $table-striped-color: $table-color !default; $table-striped-bg-factor: .05 !default; -$table-striped-bg: rgba($black, $table-striped-bg-factor) !default; +$table-striped-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-striped-bg-factor) !default; $table-active-color: $table-color !default; $table-active-bg-factor: .1 !default; -$table-active-bg: rgba($black, $table-active-bg-factor) !default; +$table-active-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-active-bg-factor) !default; $table-hover-color: $table-color !default; $table-hover-bg-factor: .075 !default; -$table-hover-bg: rgba($black, $table-hover-bg-factor) !default; +$table-hover-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-hover-bg-factor) !default; -$table-border-factor: .1 !default; +$table-border-factor: .2 !default; $table-border-width: var(--#{$prefix}border-width) !default; $table-border-color: var(--#{$prefix}border-color) !default; From bb10c996d42610489534ccf532428419d447d3da Mon Sep 17 00:00:00 2001 From: Mahmut YILDIRIM Date: Wed, 13 Sep 2023 09:45:40 +0300 Subject: [PATCH 7/8] Add defensive CSS to handle form check input in fleboxes (#38955) Co-authored-by: louismaxime.piton --- scss/forms/_form-check.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss index f8d9b08f8c..d3a8fe60da 100644 --- a/scss/forms/_form-check.scss +++ b/scss/forms/_form-check.scss @@ -29,6 +29,7 @@ .form-check-input { --#{$prefix}form-check-bg: #{$form-check-input-bg}; + flex-shrink: 0; width: $form-check-input-width; height: $form-check-input-width; margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height From bde23ae6612b71376e6cd906679425bd58d8db72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Wed, 13 Sep 2023 08:50:42 +0200 Subject: [PATCH 8/8] Allow `` colors customization for color modes (#39141) --- scss/_reboot.scss | 1 + scss/_root.scss | 3 +++ scss/_variables-dark.scss | 2 ++ scss/_variables.scss | 1 + 4 files changed, 7 insertions(+) diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 81ea21617d..18791753d0 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -217,6 +217,7 @@ small { mark { padding: $mark-padding; + color: var(--#{$prefix}highlight-color); background-color: var(--#{$prefix}highlight-bg); } diff --git a/scss/_root.scss b/scss/_root.scss index ab720a38e4..becddf14af 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -91,6 +91,7 @@ } --#{$prefix}code-color: #{$code-color}; + --#{$prefix}highlight-color: #{$mark-color}; --#{$prefix}highlight-bg: #{$mark-bg}; // scss-docs-start root-border-var @@ -171,6 +172,8 @@ --#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color-dark)}; --#{$prefix}code-color: #{$code-color-dark}; + --#{$prefix}highlight-color: #{$mark-color-dark}; + --#{$prefix}highlight-bg: #{$mark-bg-dark}; --#{$prefix}border-color: #{$border-color-dark}; --#{$prefix}border-color-translucent: #{$border-color-translucent-dark}; diff --git a/scss/_variables-dark.scss b/scss/_variables-dark.scss index 79f29a3058..6422b38744 100644 --- a/scss/_variables-dark.scss +++ b/scss/_variables-dark.scss @@ -53,6 +53,8 @@ $headings-color-dark: inherit !default; $link-color-dark: tint-color($primary, 40%) !default; $link-hover-color-dark: shift-color($link-color-dark, -$link-shade-percentage) !default; $code-color-dark: tint-color($code-color, 40%) !default; +$mark-color-dark: $body-color-dark !default; +$mark-bg-dark: $yellow-800 !default; // diff --git a/scss/_variables.scss b/scss/_variables.scss index 33ff5c2ff8..81fbde6518 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -718,6 +718,7 @@ $dt-font-weight: $font-weight-bold !default; $list-inline-padding: .5rem !default; $mark-padding: .1875em !default; +$mark-color: $body-color !default; $mark-bg: $yellow-100 !default; // scss-docs-end type-variables