diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2016-08-02 01:35:38 -0400 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2016-08-02 01:35:38 -0400 |
| commit | 27cf3d675c80029ff2cea1e14903886c00119e37 (patch) | |
| tree | a84ac3a7f6759fe0be4f099c41e6c92b58999437 /docs/components | |
| parent | f0c0a7533c854613eba42394631567a44d790053 (diff) | |
| parent | 8e4f3fe7b95f6bb7c9939288229ec5683364743d (diff) | |
| download | bootstrap-27cf3d675c80029ff2cea1e14903886c00119e37.tar.xz bootstrap-27cf3d675c80029ff2cea1e14903886c00119e37.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into v4-dev
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/carousel.md | 4 | ||||
| -rw-r--r-- | docs/components/collapse.md | 2 | ||||
| -rw-r--r-- | docs/components/tooltips.md | 10 |
3 files changed, 8 insertions, 8 deletions
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 </tr> <tr> <td>pause</td> - <td>string</td> + <td>string | null</td> <td>"hover"</td> - <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td> + <td>If set to <code>"hover"</code>, pauses the cycling of the carousel on <code>mouseenter</code> and resumes the cycling of the carousel on <code>mouseleave</code>. If set to <code>null</code>, hovering over the carousel won't pause it.</td> </tr> <tr> <td>wrap</td> 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 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. <div class="bd-example bd-example-tooltip-static"> - <div class="tooltip top" role="tooltip"> + <div class="tooltip tooltip-top" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the top </div> </div> - <div class="tooltip right" role="tooltip"> + <div class="tooltip tooltip-right" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the right </div> </div> - <div class="tooltip bottom" role="tooltip"> + <div class="tooltip tooltip-bottom" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the bottom </div> </div> - <div class="tooltip left" role="tooltip"> + <div class="tooltip tooltip-left" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the left @@ -128,7 +128,7 @@ You should only add tooltips to HTML elements that are traditionally keyboard-fo <a href="#" data-toggle="tooltip" title="Some tooltip text!">Hover over me</a> <!-- Generated markup by the plugin --> -<div class="tooltip top" role="tooltip"> +<div class="tooltip tooltip-top" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Some tooltip text! |