aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-02-21 14:52:15 -0800
committerMark Otto <[email protected]>2014-02-21 14:52:15 -0800
commit5517f9907e5660858226b99138da36951660d564 (patch)
treef1d4de3ebdc1d31c133fc8fe3d04b27aff54405f /docs
parent0c98895604902495bbc6107c62d9d8574b755193 (diff)
downloadbootstrap-5517f9907e5660858226b99138da36951660d564.tar.xz
bootstrap-5517f9907e5660858226b99138da36951660d564.zip
Fixes #12744: Document ability to remove animation on modals
Diffstat (limited to 'docs')
-rw-r--r--docs/_includes/nav-javascript.html1
-rw-r--r--docs/javascript.html7
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html
index aeeafe264..741b9cf81 100644
--- a/docs/_includes/nav-javascript.html
+++ b/docs/_includes/nav-javascript.html
@@ -14,6 +14,7 @@
<ul class="nav">
<li><a href="#modals-examples">Examples</a></li>
<li><a href="#modals-sizes">Sizes</a></li>
+ <li><a href="#modals-remove-animation">Remove animation</a></li>
<li><a href="#modals-usage">Usage</a></li>
</ul>
</li>
diff --git a/docs/javascript.html b/docs/javascript.html
index 561fc3fd9..cc125d832 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -298,6 +298,13 @@ $('#myModal').on('show.bs.modal', function (e) {
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
+ <h2 id="modals-remove-animation">Remove animation</h2>
+ <p>For modals that simply appear rather than fade in to view, remove the <code>.fade</code> class from your modal markup.</p>
+{% highlight html %}
+<div class="modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+ ...
+</div>
+{% endhighlight %}
<h2 id="modals-usage">Usage</h2>
<p>The modal plugin toggles your hidden content on demand, via data attributes or JavaScript. It also adds <code>.modal-open</code> to the <code>&lt;body&gt;</code> to override default scrolling behavior and generates a <code>.modal-backdrop</code> to provide a click area for dismissing shown modals when clicking outside the modal.</p>