aboutsummaryrefslogtreecommitdiff
path: root/docs/components
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-27 22:21:06 -0700
committerGitHub <[email protected]>2016-10-27 22:21:06 -0700
commit63a524b352c1974c3e4ba85c46569547cbe9bb64 (patch)
tree43d3d8b86d7b69024ac84df86487dc61bca754b6 /docs/components
parent20178076ee0ee6c3fe034015b54758daba326478 (diff)
parent07474841881f25b2686d50070902f341370b9d4c (diff)
downloadbootstrap-63a524b352c1974c3e4ba85c46569547cbe9bb64.tar.xz
bootstrap-63a524b352c1974c3e4ba85c46569547cbe9bb64.zip
Merge pull request #19887 from ryanburnett/v4-dev
Alphabetized carousel options & added "ride" to it
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/carousel.md18
1 files changed, 12 insertions, 6 deletions
diff --git a/docs/components/carousel.md b/docs/components/carousel.md
index 1e8d40113..3942309f0 100644
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@ -160,22 +160,28 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
<td>The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.</td>
</tr>
<tr>
+ <td>keyboard</td>
+ <td>boolean</td>
+ <td>true</td>
+ <td>Whether the carousel should react to keyboard events.</td>
+ </tr>
+ <tr>
<td>pause</td>
<td>string | null</td>
<td>"hover"</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>
- <td>boolean</td>
- <td>true</td>
- <td>Whether the carousel should cycle continuously or have hard stops.</td>
+ <td>ride</td>
+ <td>string</td>
+ <td>false</td>
+ <td>Autoplays the carousel after the user manually cycles the first item. If "carousel", autoplays the carousel on load.</td>
</tr>
<tr>
- <td>keyboard</td>
+ <td>wrap</td>
<td>boolean</td>
<td>true</td>
- <td>Whether the carousel should react to keyboard events.</td>
+ <td>Whether the carousel should cycle continuously or have hard stops.</td>
</tr>
</tbody>
</table>