diff options
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 612724c79..800f0ca7a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -214,8 +214,8 @@ <p>One fine body…</p> </div> <div class="modal-footer"> - <a href="#" class="btn btn-primary">Save changes</a> <a href="#" class="btn">Close</a> + <a href="#" class="btn btn-primary">Save changes</a> </div> </div> </div> <!-- /well --> @@ -237,10 +237,21 @@ <h4>Tooltips in a modal</h4> <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p> + + <hr> + + <h4>Overflowing text to show optional scrollbar</h4> + <p>We set a fixed <code>max-height</code> on the <code>.modal-body</code>. Watch it overflow with all this extra lorem ipsum text we've included.</p> + <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p> + <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p> + <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p> + <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p> + <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p> + <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p> </div> <div class="modal-footer"> - <a href="#" class="btn btn-primary">Save changes</a> <a href="#" class="btn" data-dismiss="modal" >Close</a> + <a href="#" class="btn btn-primary">Save changes</a> </div> </div> <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a> @@ -265,7 +276,7 @@ <td>backdrop</td> <td>boolean</td> <td>true</td> - <td>Includes a modal-backdrop element</td> + <td>Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.</td> </tr> <tr> <td>keyboard</td> @@ -298,8 +309,8 @@ <p>One fine body…</p> </div> <div class="modal-footer"> - <a href="#" class="btn btn-primary">Save changes</a> <a href="#" class="btn">Close</a> + <a href="#" class="btn btn-primary">Save changes</a> </div> </div> </pre> @@ -464,7 +475,7 @@ $('#myModal').on('hidden', function () { </div> <pre class="prettyprint linenums"> -<ul class="nav pills"> +<ul class="nav nav-pills"> <li class="active"><a href="#">Regular link</a></li> <li class="dropdown" id="menu1"> <a class="dropdown-toggle" data-toggle="dropdown" href="#menu1"> @@ -1299,10 +1310,16 @@ $('#myCollapsible').on('hidden', function () { <td>5000</td> <td>The amount of time to delay between automatically cycling an item.</td> </tr> + <tr> + <td>pause</td> + <td>string</td> + <td>"hover"</td> + <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td> + </tr> </tbody> </table> <h3>Markup</h3> - <p>Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.</p> + <p>Data attributes are used for the previous and next conrols. Check out the example markup below.</p> <pre class="prettyprint linenums"> <div id="myCarousel" class="carousel"> <!-- Carousel items --> @@ -1320,7 +1337,7 @@ $('#myCollapsible').on('hidden', function () { <h4>.carousel(options)</h4> <p>Initializes the carousel with an optional options <code>object</code> and starts cycling through items.</p> <pre class="prettyprint linenums"> -$('.myCarousel').carousel({ +$('.carousel').carousel({ interval: 2000 }) </pre> @@ -1335,7 +1352,7 @@ $('.myCarousel').carousel({ <h4>.carousel('next')</h4> <p>Cycles to the next item.</p> <h3>Events</h3> - <p>Bootstrap's modal class exposes a few events for hooking into modal functionality.</p> + <p>Bootstrap's carousel class exposes two events for hooking into carousel functionality.</p> <table class="table table-bordered table-striped"> <thead> <tr> |