From d12804eb4d9dfc8185946c5e21163362cb806ad5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Jun 2016 21:25:04 -0700 Subject: Fixes #17193: Remove mention and link to non-existant transitions plugin; that intro paragraph was two dupe sentences --- docs/components/collapse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components') diff --git a/docs/components/collapse.md b/docs/components/collapse.md index e328e589e..f3a6fdc6c 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -4,7 +4,7 @@ title: Collapse group: components --- -The Bootstrap collapse plugin allows you to toggle content on your pages with a bit of JavaScript and some classes. Flexible plugin that utilizes a handful of classes (from the **required [transitions plugin]({{ site.baseurl }}/components/transitions/)**) for easy toggle behavior. +The Bootstrap collapse plugin allows you to toggle content on your pages with a few classes thanks to some helpful JavaScript. ## Contents -- cgit v1.2.3 From ef9099a23761aa97b874953a2ac0cfaba7abefc0 Mon Sep 17 00:00:00 2001 From: Pvanhesteren Date: Sun, 17 Jul 2016 00:17:18 -0700 Subject: Port #19410 to v4 Clarify valid values of Carousel's `pause` option Fixes #18205 [skip sauce] --- docs/components/carousel.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/components') diff --git a/docs/components/carousel.md b/docs/components/carousel.md index 76278281e..5f177432f 100644 --- a/docs/components/carousel.md +++ b/docs/components/carousel.md @@ -158,9 +158,9 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap pause - string + string | null "hover" - Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave. + If set to "hover", pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave. If set to null, hovering over the carousel won't pause it. wrap -- cgit v1.2.3 From 6157001bcd39d56524a1135bab66b98f6fe33fb3 Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Thu, 21 Jul 2016 12:44:26 -0700 Subject: Tooltip Static Demo uses v3 class names --- docs/components/tooltips.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/components') diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md index fb8cb24dd..a102aa925 100644 --- a/docs/components/tooltips.md +++ b/docs/components/tooltips.md @@ -49,25 +49,25 @@ Hover over the links below to see tooltips: Four options are available: top, right, bottom, and left aligned.
-