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/carousel.md | |
| 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/carousel.md')
| -rw-r--r-- | docs/components/carousel.md | 4 |
1 files changed, 2 insertions, 2 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> |