From 88d35b725bb29a53770d89a6e89fd416f2314ceb Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 5 Jan 2021 22:56:44 +0100 Subject: [PATCH 01/44] Hyphen to dash for ranges (#32488) * Hyphen to dash for ranges * Hyphen to dash for ranges * Hyphen to dash for ranges * Hyphen to dash for ranges * Hyphen to dash for ranges --- site/content/docs/5.0/examples/carousel-rtl/index.html | 2 +- site/content/docs/5.0/examples/carousel/index.html | 2 +- site/content/docs/5.0/examples/pricing/index.html | 2 +- site/content/docs/5.0/examples/product/index.html | 2 +- site/content/docs/5.0/examples/sign-in/index.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/content/docs/5.0/examples/carousel-rtl/index.html b/site/content/docs/5.0/examples/carousel-rtl/index.html index a446be716..a55560e26 100644 --- a/site/content/docs/5.0/examples/carousel-rtl/index.html +++ b/site/content/docs/5.0/examples/carousel-rtl/index.html @@ -162,6 +162,6 @@ extra_css: diff --git a/site/content/docs/5.0/examples/carousel/index.html b/site/content/docs/5.0/examples/carousel/index.html index 42effad08..07d579c43 100644 --- a/site/content/docs/5.0/examples/carousel/index.html +++ b/site/content/docs/5.0/examples/carousel/index.html @@ -161,6 +161,6 @@ extra_css: diff --git a/site/content/docs/5.0/examples/pricing/index.html b/site/content/docs/5.0/examples/pricing/index.html index 714283bad..58bb22ccf 100644 --- a/site/content/docs/5.0/examples/pricing/index.html +++ b/site/content/docs/5.0/examples/pricing/index.html @@ -81,7 +81,7 @@ include_js: false
- © 2017-{{< year >}} + © 2017–{{< year >}}
Features
diff --git a/site/content/docs/5.0/examples/product/index.html b/site/content/docs/5.0/examples/product/index.html index 8a25fe1dd..423890e3b 100644 --- a/site/content/docs/5.0/examples/product/index.html +++ b/site/content/docs/5.0/examples/product/index.html @@ -104,7 +104,7 @@ extra_css:
Product - © 2017-{{< year >}} + © 2017–{{< year >}}
Features
diff --git a/site/content/docs/5.0/examples/sign-in/index.html b/site/content/docs/5.0/examples/sign-in/index.html index ac5b6104b..6fefc45e6 100644 --- a/site/content/docs/5.0/examples/sign-in/index.html +++ b/site/content/docs/5.0/examples/sign-in/index.html @@ -21,6 +21,6 @@ include_js: false
-

© 2017-{{< year >}}

+

© 2017–{{< year >}}

From d1a62b47c38d2098577894e9b6340514af07754b Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Wed, 6 Jan 2021 00:59:44 +0000 Subject: [PATCH 02/44] Tweak wording for no-touch carousel (#32688) based on changes made in the backport https://github.com/twbs/bootstrap/pull/32639 --- site/content/docs/5.0/components/carousel.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/docs/5.0/components/carousel.md b/site/content/docs/5.0/components/carousel.md index 6aa9f614f..49bb0f9bf 100644 --- a/site/content/docs/5.0/components/carousel.md +++ b/site/content/docs/5.0/components/carousel.md @@ -206,9 +206,9 @@ Add `data-bs-interval=""` to a `.carousel-item` to change the amount of time to
{{< /example >}} -### Suppressing touch swiping +### Disable touch swiping -By default, carousels support swiping left/right on touchscreen devices to move between slides. This can be explicitly suppressed using the `data-bs-touch` attribute. The example below also does not include the `data-bs-ride` attribute, and has `data-bs-interval="false"`, meaning that it won't autoplay. +Carousels support swiping left/right on touchscreen devices to move between slides. This can be disabled using the `data-bs-touch` attribute. The example below also does not include the `data-bs-ride` attribute and has `data-bs-interval="false"` so it doesn't autoplay. {{< example >}}