From 4380ca434885f33072885e639a2d29cc203771bd Mon Sep 17 00:00:00 2001
From: nkav <nakavthekar@gmail.com>
Date: Sun, 19 Jan 2014 14:19:20 -0500
Subject: Corrected tag for Alert JS animation example from <a> to <button>

Also removed href attribute and added type="button"
---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 323f1f684..bdb102158 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1366,7 +1366,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">&times;</a>{% endhighlight %}
+  {% highlight html %}<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>{% endhighlight %}
 
   <h3>Methods</h3>
 
-- 
cgit v1.2.3


From 4a36ecaac64dea84be85b4876fc3c8d20d87f8e8 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Mon, 20 Jan 2014 23:36:52 +0100
Subject: fix #12314

---
 docs/javascript.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index bdb102158..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>
-- 
cgit v1.2.3