diff options
| author | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
| commit | f4eefd28d10198ea60ce4069c00236e74cda1bf5 (patch) | |
| tree | 9141bf9c907a2bf7962ca5abdb6f0c8496d8b1ad /docs/_includes/js/carousel.html | |
| parent | dfa2759a52e73e720b0cda302a1edb9e2dbebc1f (diff) | |
| parent | 1ebc7e62a8672c59c3bd886bc71ca90e9571d1bc (diff) | |
| download | bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.tar.xz bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.zip | |
Merge branch 'master' into sr_friendly_hidden_content
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/js/carousel.html')
| -rw-r--r-- | docs/_includes/js/carousel.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html index 728356268..23f9af97a 100644 --- a/docs/_includes/js/carousel.html +++ b/docs/_includes/js/carousel.html @@ -1,8 +1,9 @@ <div class="bs-docs-section"> <h1 id="carousel" class="page-header">Carousel <small>carousel.js</small></h1> + <p>A slideshow component for cycling through elemnts, like a carousel. <strong>Nested carousels are not supported.</strong></p> + <h2 id="carousel-examples">Examples</h2> - <p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p> <div class="bs-example"> <div id="carousel-example-generic" class="carousel slide" data-ride="carousel"> <ol class="carousel-indicators"> |