fix modal examples on js page, update modal close button positioning

diff --git a/bootstrap.css b/bootstrap.css
index ffdf19f2e403cbf1db01b0b3e0bbdedd06739c83..85b515ecc3536c09fb223542438874520aa2905f 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Jan 25 09:50:58 PST 2012
+ * Date: Wed Jan 25 09:53:40 PST 2012
  */
 article,
 aside,
@@ -2170,7 +2170,7 @@ table .headerSortUp:after {
   border-bottom: 1px solid #eee;
 }
 .modal-header .close {
-  margin-top: 7px;
+  margin-top: 2px;
 }
 .modal-body {
   padding: 15px;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 9be1c65d475008799951b3dd6997097b58266341..cd155d561d49f85b07b985327e28ba20adf2fdb8 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -424,7 +424,7 @@ table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;b
 .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;}
 .modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
 .modal.fade.in{top:50%;}
-.modal-header{padding:5px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:7px;}
+.modal-header{padding:5px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
 .modal-body{padding:15px;}
 .modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
 .modal-footer:after{clear:both;}

diff --git a/docs/javascript.html b/docs/javascript.html
index 5977006ffd8cc36552e99edbf6b8d19a6f30f12f..c6682660f84724e5912746599a0ed3858f240636 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -211,7 +211,7 @@
           <!-- sample modal content -->
           <div id="myModal" class="modal hide fade">
             <div class="modal-header">
-              <a href="#" class="close" data-dismiss="modal" >&times;</a>
+              <a class="close" data-dismiss="modal" >&times;</a>
               <h3>Modal Heading</h3>
             </div>
             <div class="modal-body">
@@ -271,7 +271,7 @@
 <pre class="prettyprint linenums">
 &lt;div class="modal"&gt;
   &lt;div class="modal-header"&gt;
-    &lt;a href="#" class="close js-dismiss"&gt;&times;&lt;/a&gt;
+    &lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt;
     &lt;h3&gt;Modal header&lt;/h3&gt;
   &lt;/div&gt;
   &lt;div class="modal-body"&gt;

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 7671bc99ade49badd40585027b6758f3e80c13a8..1c6aa4705224519febc7cb2ffc8e8ff0f1cf8dcf 100644 (file)
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -148,7 +148,7 @@
           <!-- sample modal content -->
           <div id="myModal" class="modal hide fade">
             <div class="modal-header">
-              <a href="#" class="close" data-dismiss="modal" >&times;</a>
+              <a class="close" data-dismiss="modal" >&times;</a>
               <h3>{{_i}}Modal Heading{{/i}}</h3>
             </div>
             <div class="modal-body">
@@ -162,7 +162,7 @@
               <p>{{_i}}<a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.{{/i}}</p>
             </div>
             <div class="modal-footer">
-              <a href="#" class="btn primary">{{_i}}Save changes<{{/i}}/a>
+              <a href="#" class="btn primary">{{_i}}Save changes{{/i}}</a>
               <a href="#" class="btn" data-dismiss="modal" >{{_i}}Close{{/i}}</a>
             </div>
           </div>
@@ -208,7 +208,7 @@
 <pre class="prettyprint linenums">
 &lt;div class="modal"&gt;
   &lt;div class="modal-header"&gt;
-    &lt;a href="#" class="close js-dismiss"&gt;&times;&lt;/a&gt;
+    &lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt;
     &lt;h3&gt;Modal header&lt;/h3&gt;
   &lt;/div&gt;
   &lt;div class="modal-body"&gt;

diff --git a/lib/modals.less b/lib/modals.less
index d6efccd39aaef831de50a16366b276d3e53a226d..0368e01e10db487f8d409d8ec61a728b8ff09c9f 100644 (file)
--- a/lib/modals.less
+++ b/lib/modals.less
@@ -44,7 +44,7 @@
   padding: 5px 15px;
   border-bottom: 1px solid #eee;
   // Close icon
-  .close { margin-top: 7px; }
+  .close { margin-top: 2px; }
 }
 .modal-body {
   padding: 15px;