From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 17 May 2012 02:10:49 +0000 (-0700)
Subject: Merge branch 'master' into 2.0.4-wip
X-Git-Tag: v2.1.0~2^2~351^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b53778150c37bf9b45798b3c54330b2403ac915;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into 2.0.4-wip
---

4b53778150c37bf9b45798b3c54330b2403ac915
diff --cc docs/javascript.html
index 0208af819d,3a1f151cde..07e95f2840
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@@ -199,10 -223,11 +199,11 @@@
  
            <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 class="close" data-dismiss="modal">&times;</button>
 +              <button type="button" class="close" data-dismiss="modal">&times;</button>
                <h3>Modal Heading</h3>
              </div>
              <div class="modal-body">
diff --cc docs/templates/pages/javascript.mustache
index f5c6ce9107,3fec56d307..ffc19a98f5
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@@ -122,10 -146,11 +122,11 @@@
  
            <h2>{{_i}}Live demo{{/i}}</h2>
            <p>{{_i}}Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.{{/i}}</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 class="close" data-dismiss="modal">&times;</button>
 +              <button type="button" class="close" data-dismiss="modal">&times;</button>
                <h3>{{_i}}Modal Heading{{/i}}</h3>
              </div>
              <div class="modal-body">