aboutsummaryrefslogtreecommitdiff
path: root/docs/components/carousel.md
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-07-23 21:05:18 -0700
committerMark Otto <[email protected]>2016-07-23 21:05:18 -0700
commit7fd00263e35f891bfc792f9dd12c17a5025cd93c (patch)
tree28d07418fb7abfacccb317b501937e02ffccf096 /docs/components/carousel.md
parentd4457b33032d2540a4a3b7fa600f22055ce2000d (diff)
parent38312640df9c4b84a47e62d7dfeb16b25049aafb (diff)
downloadbootstrap-7fd00263e35f891bfc792f9dd12c17a5025cd93c.tar.xz
bootstrap-7fd00263e35f891bfc792f9dd12c17a5025cd93c.zip
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/components/carousel.md')
-rw-r--r--docs/components/carousel.md4
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>