From 93d3b4da94cc34f7c55e39cfbed159f0e2886328 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 6 Aug 2023 09:58:47 +0200 Subject: Merging upstream version 5.3.1+dfsg. Signed-off-by: Daniel Baumann --- site/assets/js/code-examples.js | 13 ++--- site/assets/scss/_component-examples.scss | 7 +-- site/content/docs/5.3/components/alerts.md | 2 +- site/content/docs/5.3/components/button-group.md | 10 ++-- site/content/docs/5.3/components/buttons.md | 36 +++++++++----- site/content/docs/5.3/components/card.md | 4 +- site/content/docs/5.3/components/collapse.md | 4 +- site/content/docs/5.3/components/dropdowns.md | 2 +- site/content/docs/5.3/components/list-group.md | 2 +- site/content/docs/5.3/components/navbar.md | 18 +++---- site/content/docs/5.3/components/navs-tabs.md | 38 +++++++-------- site/content/docs/5.3/components/placeholders.md | 6 +-- site/content/docs/5.3/components/spinners.md | 20 ++++---- site/content/docs/5.3/components/tooltips.md | 8 ++- site/content/docs/5.3/customize/sass.md | 57 +++++++++++++++++++--- site/content/docs/5.3/examples/badges/index.html | 2 +- site/content/docs/5.3/examples/blog-rtl/index.html | 4 +- site/content/docs/5.3/examples/blog/index.html | 4 +- .../docs/5.3/examples/breadcrumbs/index.html | 2 +- site/content/docs/5.3/examples/buttons/index.html | 10 ++-- .../docs/5.3/examples/carousel-rtl/index.html | 4 +- site/content/docs/5.3/examples/carousel/index.html | 4 +- .../docs/5.3/examples/cheatsheet-rtl/index.html | 8 +-- .../docs/5.3/examples/cheatsheet/cheatsheet.css | 15 +++--- .../5.3/examples/cheatsheet/cheatsheet.rtl.css | 15 +++--- .../docs/5.3/examples/cheatsheet/index.html | 8 +-- .../docs/5.3/examples/dashboard-rtl/index.html | 4 +- .../content/docs/5.3/examples/dashboard/index.html | 4 +- .../content/docs/5.3/examples/dropdowns/index.html | 2 +- site/content/docs/5.3/examples/features/index.html | 2 +- site/content/docs/5.3/examples/footers/index.html | 2 +- site/content/docs/5.3/examples/headers/index.html | 2 +- .../docs/5.3/examples/jumbotrons/index.html | 2 +- .../docs/5.3/examples/list-groups/index.html | 2 +- site/content/docs/5.3/examples/modals/index.html | 2 +- .../docs/5.3/examples/navbar-bottom/index.html | 2 +- .../docs/5.3/examples/navbar-fixed/index.html | 2 +- .../docs/5.3/examples/navbar-static/index.html | 2 +- site/content/docs/5.3/examples/navbars/index.html | 24 ++++----- site/content/docs/5.3/examples/pricing/index.html | 2 +- site/content/docs/5.3/examples/product/index.html | 2 +- site/content/docs/5.3/examples/sidebars/index.html | 10 ++-- .../docs/5.3/examples/starter-template/index.html | 2 +- .../5.3/examples/sticky-footer-navbar/index.html | 2 +- site/content/docs/5.3/forms/checks-radios.md | 29 +++++++++-- site/content/docs/5.3/forms/floating-labels.md | 2 +- site/content/docs/5.3/forms/form-control.md | 6 +-- site/content/docs/5.3/forms/select.md | 8 +-- .../content/docs/5.3/getting-started/javascript.md | 4 +- site/content/docs/5.3/getting-started/webpack.md | 2 +- site/content/docs/5.3/helpers/stacks.md | 4 +- site/content/docs/5.3/helpers/vertical-rule.md | 8 +++ site/content/docs/5.3/migration.md | 4 +- site/content/docs/5.3/utilities/float.md | 11 +++-- site/content/docs/5.3/utilities/opacity.md | 2 + site/content/docs/5.3/utilities/text.md | 11 +++-- site/data/docs-versions.yml | 6 +-- site/layouts/_default/examples.html | 2 +- .../warning-color-assistive-technologies.md | 2 +- site/layouts/partials/docs-navbar.html | 6 +-- site/layouts/partials/footer.html | 22 ++++----- site/layouts/partials/header.html | 2 - site/layouts/partials/home/masthead.html | 2 - site/layouts/partials/icons.html | 2 +- site/layouts/partials/scripts.html | 3 +- site/layouts/partials/stylesheet.html | 2 - site/layouts/shortcodes/js-docs.html | 8 ++- site/layouts/shortcodes/scss-docs.html | 8 ++- 68 files changed, 308 insertions(+), 221 deletions(-) (limited to 'site') diff --git a/site/assets/js/code-examples.js b/site/assets/js/code-examples.js index e1f680e..3b03b17 100644 --- a/site/assets/js/code-examples.js +++ b/site/assets/js/code-examples.js @@ -20,18 +20,19 @@ const btnHtml = [ '
', - '
', - ' ', - '
', + '
', + ' ', + '
', '
' ].join('') // Wrap programmatically code blocks and add copy btn. document.querySelectorAll('.highlight') .forEach(element => { - if (!element.closest('.bd-example-snippet')) { // Ignore examples made be shortcode + // Ignore examples made by shortcode + if (!element.closest('.bd-example-snippet')) { element.insertAdjacentHTML('beforebegin', btnHtml) element.previousElementSibling.append(element) } diff --git a/site/assets/scss/_component-examples.scss b/site/assets/scss/_component-examples.scss index 0f1018b..1d8caed 100644 --- a/site/assets/scss/_component-examples.scss +++ b/site/assets/scss/_component-examples.scss @@ -220,15 +220,16 @@ // scss-docs-start custom-tooltip .custom-tooltip { - --bs-tooltip-bg: var(--bs-primary); + --bs-tooltip-bg: var(--bd-violet-bg); + --bs-tooltip-color: var(--bs-white); } // scss-docs-end custom-tooltip // scss-docs-start custom-popovers .custom-popover { --bs-popover-max-width: 200px; - --bs-popover-border-color: var(--bs-primary); - --bs-popover-header-bg: var(--bs-primary); + --bs-popover-border-color: var(--bd-violet-bg); + --bs-popover-header-bg: var(--bd-violet-bg); --bs-popover-header-color: var(--bs-white); --bs-popover-body-padding-x: 1rem; --bs-popover-body-padding-y: .5rem; diff --git a/site/content/docs/5.3/components/alerts.md b/site/content/docs/5.3/components/alerts.md index d634ce2..9eb64df 100644 --- a/site/content/docs/5.3/components/alerts.md +++ b/site/content/docs/5.3/components/alerts.md @@ -84,7 +84,7 @@ Similarly, you can use [flexbox utilities]({{< docsref "/utilities/flex" >}}) an Need more than one icon for your alerts? Consider using more Bootstrap Icons and making a local SVG sprite like so to easily reference the same icons repeatedly. {{< example >}} - + diff --git a/site/content/docs/5.3/components/button-group.md b/site/content/docs/5.3/components/button-group.md index 9c63562..9f26a91 100644 --- a/site/content/docs/5.3/components/button-group.md +++ b/site/content/docs/5.3/components/button-group.md @@ -190,8 +190,6 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli - - {{< /example >}} @@ -208,9 +206,7 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
  • Dropdown link
    • - - -
    +
    @@ -219,7 +215,7 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
  • Dropdown link
    • -
    +
    @@ -228,7 +224,7 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
  • Dropdown link
    • -
    +
    diff --git a/site/content/docs/5.3/components/buttons.md b/site/content/docs/5.3/components/buttons.md index ae58fca..83a6138 100644 --- a/site/content/docs/5.3/components/buttons.md +++ b/site/content/docs/5.3/components/buttons.md @@ -129,7 +129,7 @@ To cover cases where you have to keep the `href` attribute on a disabled link, t ## Block buttons -Create responsive stacks of full-width, "block buttons" like those in Bootstrap 4 with a mix of our display and gap utilities. By using utilities instead of button specific classes, we have much greater control over spacing, alignment, and responsive behaviors. +Create responsive stacks of full-width, "block buttons" like those in Bootstrap 4 with a mix of our display and gap utilities. By using utilities instead of button-specific classes, we have much greater control over spacing, alignment, and responsive behaviors. {{< example >}}
    @@ -156,7 +156,7 @@ You can adjust the width of your block buttons with grid column width classes. F
    {{< /example >}} -Additional utilities can be used to adjust the alignment of buttons when horizontal. Here we've taken our previous responsive example and added some flex utilities and a margin utility on the button to right align the buttons when they're no longer stacked. +Additional utilities can be used to adjust the alignment of buttons when horizontal. Here we've taken our previous responsive example and added some flex utilities and a margin utility on the button to right-align the buttons when they're no longer stacked. {{< example >}}
    @@ -178,15 +178,29 @@ Visually, these toggle buttons are identical to the [checkbox toggle buttons]({{ Add `data-bs-toggle="button"` to toggle a button's `active` state. If you're pre-toggling a button, you must manually add the `.active` class **and** `aria-pressed="true"` to ensure that it is conveyed appropriately to assistive technologies. {{< example >}} - - - +

    + + + +

    +

    + + + +

    {{< /example >}} {{< example >}} -Toggle link -Active toggle link -Disabled toggle link +

    + Toggle link + Active toggle link + Disabled toggle link +

    +

    + Toggle link + Active toggle link + Disabled toggle link +

    {{< /example >}} ### Methods @@ -201,8 +215,8 @@ const bsButton = new bootstrap.Button('#myButton') | Method | Description | | --- | --- | | `dispose` | Destroys an element's button. (Removes stored data on the DOM element) | -| `getInstance` | Static method which allows you to get the button instance associated to a DOM element, you can use it like this: `bootstrap.Button.getInstance(element)`. | -| `getOrCreateInstance` | Static method which returns a button instance associated to a DOM element or create a new one in case it wasn't initialized. You can use it like this: `bootstrap.Button.getOrCreateInstance(element)`. | +| `getInstance` | Static method which allows you to get the button instance associated with a DOM element, you can use it like this: `bootstrap.Button.getInstance(element)`. | +| `getOrCreateInstance` | Static method which returns a button instance associated with a DOM element or creates a new one in case it wasn't initialized. You can use it like this: `bootstrap.Button.getOrCreateInstance(element)`. | | `toggle` | Toggles push state. Gives the button the appearance that it has been activated. | {{< /bs-table >}} @@ -227,7 +241,7 @@ As part of Bootstrap's evolving CSS variables approach, buttons now use local CS Each `.btn-*` modifier class updates the appropriate CSS variables to minimize additional CSS rules with our `button-variant()`, `button-outline-variant()`, and `button-size()` mixins. -Here's an example of building a custom `.btn-*` modifier class like we do for the buttons unique to our docs by reassigning Bootstrap's CSS variables with a mixture of our own CSS and Sass variables. +Here's an example of building a custom `.btn-*` modifier class as we do for the buttons unique to our docs by reassigning Bootstrap's CSS variables with a mixture of our own CSS and Sass variables.
    diff --git a/site/content/docs/5.3/components/card.md b/site/content/docs/5.3/components/card.md index 2ad32b4..6138c3d 100644 --- a/site/content/docs/5.3/components/card.md +++ b/site/content/docs/5.3/components/card.md @@ -309,7 +309,7 @@ Add some navigation to a card's header (or block) with Bootstrap's [nav componen Link
  • - Disabled + Disabled
    • @@ -332,7 +332,7 @@ Add some navigation to a card's header (or block) with Bootstrap's [nav componen Link
  • - Disabled + Disabled
    • diff --git a/site/content/docs/5.3/components/collapse.md b/site/content/docs/5.3/components/collapse.md index 21b9c3e..d517115 100644 --- a/site/content/docs/5.3/components/collapse.md +++ b/site/content/docs/5.3/components/collapse.md @@ -25,7 +25,7 @@ Click the buttons below to show and hide another element via class changes: Generally, we recommend using a ` diff --git a/site/content/docs/5.3/components/dropdowns.md b/site/content/docs/5.3/components/dropdowns.md index 0988820..6e3811f 100644 --- a/site/content/docs/5.3/components/dropdowns.md +++ b/site/content/docs/5.3/components/dropdowns.md @@ -661,7 +661,7 @@ Add `.disabled` to items in the dropdown to **style them as disabled**. {{< example >}} {{< /example >}} diff --git a/site/content/docs/5.3/components/list-group.md b/site/content/docs/5.3/components/list-group.md index 6c22809..598bb38 100644 --- a/site/content/docs/5.3/components/list-group.md +++ b/site/content/docs/5.3/components/list-group.md @@ -62,7 +62,7 @@ Be sure to **not use the standard `.btn` classes here**. A second link item A third link item A fourth link item - A disabled link item + A disabled link item
    {{< /example >}} diff --git a/site/content/docs/5.3/components/navbar.md b/site/content/docs/5.3/components/navbar.md index 9b9f86a..ab6c230 100644 --- a/site/content/docs/5.3/components/navbar.md +++ b/site/content/docs/5.3/components/navbar.md @@ -63,7 +63,7 @@ Here's an example of all the sub-components included in a responsive light-theme
  • - Disabled + Disabled
    • @@ -179,7 +179,7 @@ And because we use classes for our navs, you can avoid the list-based approach e Home Features Pricing - Disabled + Disabled
    @@ -331,7 +331,7 @@ Mix and match with other components and utilities as needed. Navbar themes are easier than ever thanks to Bootstrap's combination of Sass and CSS variables. The default is our "light navbar" for use with light background colors, but you can also apply `data-bs-theme="dark"` to the `.navbar` parent for dark background colors. Then, customize with `.bg-*` and additional utilities.
    - {{< /example >}} @@ -294,7 +294,7 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin Link
  • - Disabled + Disabled
    • {{< /example >}} @@ -320,7 +320,7 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin Link
  • - Disabled + Disabled
    • {{< /example >}} @@ -567,7 +567,7 @@ And with vertical pills. Ideally, for vertical tabs, you should also add `aria-o Dynamic tabbed interfaces, as described in the [ARIA Authoring Practices Guide tabs pattern](https://www.w3.org/WAI/ARIA/apg/patterns/tabpanel/), require `role="tablist"`, `role="tab"`, `role="tabpanel"`, and additional `aria-` attributes in order to convey their structure, functionality, and current state to users of assistive technologies (such as screen readers). As a best practice, we recommend using `
    @@ -67,7 +67,7 @@ In the example below, we take a typical card component and recreate it with plac

    - + ``` @@ -83,7 +83,7 @@ We apply additional styling to `.btn`s via `::before` to ensure the `height` is

    - + {{< /example >}} {{< callout info >}} diff --git a/site/content/docs/5.3/components/spinners.md b/site/content/docs/5.3/components/spinners.md index f2635c6..977257d 100644 --- a/site/content/docs/5.3/components/spinners.md +++ b/site/content/docs/5.3/components/spinners.md @@ -96,8 +96,8 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex {{< example >}}
    - Loading... - + Loading... +
    {{< /example >}} @@ -151,23 +151,23 @@ Use spinners within buttons to indicate an action is currently processing or tak {{< example >}} {{< /example >}} {{< example >}} {{< /example >}} diff --git a/site/content/docs/5.3/components/tooltips.md b/site/content/docs/5.3/components/tooltips.md index cf628e3..91adacc 100644 --- a/site/content/docs/5.3/components/tooltips.md +++ b/site/content/docs/5.3/components/tooltips.md @@ -157,7 +157,7 @@ const tooltip = new bootstrap.Tooltip('#example', { The required markup for a tooltip is only a `data` attribute and `title` on the HTML element you wish to have a tooltip. The generated markup of a tooltip is rather simple, though it does require a position (by default, set to `top` by the plugin). {{< callout warning >}} -**Keep tooltips accessible to keyboard and assistive technology users** by only adding them to HTML elements that are traditionally keyboard-focusable and interactive (such as links or form controls). While other HTML elements can be made focusable by adding `tabindex="0"`, this can create annoying and confusing tab stops on non-interactive elements for keyboard users, and most assistive technologies currently do not announce tooltips in this situation. Additionally, do not rely solely on `hover` as the trigger for your tooltips as this will make theme impossible to trigger for keyboard users. +**Keep tooltips accessible to keyboard and assistive technology users** by only adding them to HTML elements that are traditionally keyboard-focusable and interactive (such as links or form controls). While other HTML elements can be made focusable by adding `tabindex="0"`, this can create annoying and confusing tab stops on non-interactive elements for keyboard users, and most assistive technologies currently do not announce tooltips in this situation. Additionally, do not rely solely on `hover` as the trigger for your tooltips as this will make them impossible to trigger for keyboard users. {{< /callout >}} ```html @@ -165,7 +165,7 @@ The required markup for a tooltip is only a `data` attribute and `title` on the Hover over me -