diff options
| author | Mark Otto <[email protected]> | 2014-01-20 22:12:02 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-20 22:12:02 -0600 |
| commit | e4f33a91d9969edbddc369230965b3a5628f24ac (patch) | |
| tree | ff3724fa51b93296c8b3b69e126fcded36159d16 /docs/javascript.html | |
| parent | 317aa8092dcbf182ef3bdcc8d0222096fc6a51ea (diff) | |
| parent | ebc4f998dccf0d709a143348c02777d9c4695abb (diff) | |
| download | bootstrap-e4f33a91d9969edbddc369230965b3a5628f24ac.tar.xz bootstrap-e4f33a91d9969edbddc369230965b3a5628f24ac.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 323f1f684..7d41a0378 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -102,6 +102,10 @@ $('#myModal').on('show.bs.modal', function (e) { <h4>Overlapping modals not supported</h4> <p>Be sure not to open a modal while another is still visible. Showing more than one modal at a time requires custom code.</p> </div> + <div class="bs-callout bs-callout-warning" id="callout-modal-markup-placement"> + <h4>Modal markup placement</h4> + <p>Always try to place a modal's HTML code in a top-level position in your document to avoid other components affecting the modal's appearance and/or functionality.</p> + </div> <div class="bs-callout bs-callout-warning"> <h4>Mobile device caveats</h4> <p>There are some caveats regarding using modals on mobile devices. <a href="../getting-started/#support-fixed-position-keyboards">See our browser support docs</a> for details.</p> @@ -1366,7 +1370,7 @@ $('#myPopover').on('hidden.bs.popover', function () { <h3>Markup</h3> <p>Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.</p> - {% highlight html %}<a class="close" data-dismiss="alert" href="#" aria-hidden="true">×</a>{% endhighlight %} + {% highlight html %}<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>{% endhighlight %} <h3>Methods</h3> |