diff options
| author | Mark Otto <[email protected]> | 2016-07-23 21:05:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-07-23 21:05:18 -0700 |
| commit | 7fd00263e35f891bfc792f9dd12c17a5025cd93c (patch) | |
| tree | 28d07418fb7abfacccb317b501937e02ffccf096 /docs/components | |
| parent | d4457b33032d2540a4a3b7fa600f22055ce2000d (diff) | |
| parent | 38312640df9c4b84a47e62d7dfeb16b25049aafb (diff) | |
| download | bootstrap-7fd00263e35f891bfc792f9dd12c17a5025cd93c.tar.xz bootstrap-7fd00263e35f891bfc792f9dd12c17a5025cd93c.zip | |
Merge branch 'v4-dev' into v4-navbars
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/modal.md | 4 |
3 files changed, 3 insertions, 7 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/modal.md b/docs/components/modal.md index f3c29dac6..55a0878b6 100644 --- a/docs/components/modal.md +++ b/docs/components/modal.md @@ -480,10 +480,6 @@ Bootstrap's modal class exposes a few events for hooking into modal functionalit <td>hidden.bs.modal</td> <td>This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete).</td> </tr> - <tr> - <td>loaded.bs.modal</td> - <td>This event is fired when the modal has loaded content using the <code>remote</code> option.</td> - </tr> </tbody> </table> </div> |