diff options
| author | Jacob Thornton <[email protected]> | 2012-05-16 19:10:49 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-05-16 19:10:49 -0700 |
| commit | 4b53778150c37bf9b45798b3c54330b2403ac915 (patch) | |
| tree | 9a565ef1435db033eb22d19f0a468af763e313d1 /docs/javascript.html | |
| parent | 5ecab6112cb3a53b3222f90c44b0938929e71ac9 (diff) | |
| parent | a404ac33bb9e78323b84d0840735445579634b9e (diff) | |
| download | bootstrap-4b53778150c37bf9b45798b3c54330b2403ac915.tar.xz bootstrap-4b53778150c37bf9b45798b3c54330b2403ac915.zip | |
Merge branch 'master' into 2.0.4-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 0208af819..07e95f284 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -199,8 +199,9 @@ <h2>Live demo</h2> <p>Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.</p> + <!-- sample modal content --> - <div id="myModal" class="modal hide fade"> + <div id="myModal" class="modal hide fade" tabindex=0> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal">×</button> <h3>Modal Heading</h3> @@ -209,6 +210,11 @@ <h4>Text in a modal</h4> <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p> + <form class="well"> + <label>Label name</label> + <input type="text" class="span3" placeholder="Type something…"> + </form> + <h4>Popover in a modal</h4> <p>This <a href="#" class="btn popover-test" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on hover.</p> |