clean up show logic

diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css
index c270f641f9fef5fb1b9fbd7e1d112a626a8bee75..778f4b63881b8fe5ee4a529b93ac1f883ac72d9b 100644 (file)
--- a/bootstrap-1.1.1.css
+++ b/bootstrap-1.1.1.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: Sat Aug 27 00:02:34 PDT 2011
+ * Date: Sat Aug 27 00:28:54 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1790,7 +1790,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   opacity: 0;
 }
 .modal-backdrop.open, .modal.open {
-  display: block;
   opacity: 1;
 }
 .modal-backdrop {
@@ -1803,7 +1802,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   z-index: 1000;
 }
 .modal {
-  display: none;
   position: fixed;
   top: 50%;
   left: 50%;

diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css
index 3dd3d88b04c2d4796111c2491086e2b741412fe3..68140d7091808c781b5950e8af7c692e1cf02215 100644 (file)
--- a/bootstrap-1.1.1.min.css
+++ b/bootstrap-1.1.1.min.css
@@ -233,9 +233,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:transparent;color:#bfbfbf;}
 .pagination ul li.next a{border:0;}
 .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
-.modal-backdrop,.modal{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.modal-backdrop.open,.modal.open{display:block;opacity:1;}
+.modal-backdrop,.modal{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.modal-backdrop.open,.modal.open{opacity:1;}
 .modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
-.modal{display:none;position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;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 .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
+.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;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 .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
 .modal .modal-body{padding:20px;}
 .modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;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;margin-bottom:18px;margin-bottom:0;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
 .modal .modal-footer:after{clear:both;}

diff --git a/examples/assets/js/bootstrap-modals.js b/examples/assets/js/bootstrap-modals.js
index f684be25a47bab0adb9329fa1bc386455b13ed7a..05a693d82d1d937ff2504933f5cfbfb8ea8647b9 100644 (file)
--- a/examples/assets/js/bootstrap-modals.js
+++ b/examples/assets/js/bootstrap-modals.js
@@ -65,6 +65,7 @@
       this.$element = $(this.settings.content)
         .delegate('.close', 'click', function (e) { e.preventDefault(); that.close() })
         .appendTo(document.body)
+        .show()
 
       setTimeout(function () {
         that.$element.addClass('open')

diff --git a/examples/bootstrap-js.html b/examples/bootstrap-js.html
index 2cf545148a7395442ed0335e7689df3a074d8b7d..37aea34648dcafb956ece62f54db6193ba2315c9 100644 (file)
--- a/examples/bootstrap-js.html
+++ b/examples/bootstrap-js.html
@@ -118,7 +118,7 @@ $('#modal-content').modal({
           <h3>Demo</h3>
 
           <!-- sample modal content -->
-          <div id="modal-from-dom" class="modal">
+          <div id="modal-from-dom" style="display: none" class="modal">
             <div class="modal-header">
               <h3>Modal Heading</h3>
               <a href="#" class="close">&times;</a>

diff --git a/lib/patterns.less b/lib/patterns.less
index cf2edf4d7b5488b83fde5014eeddacbe2993a5e0..b1be9a18cfb640f4adc009af6f36b5083cb4f09c 100644 (file)
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -584,7 +584,6 @@ input[type=submit].btn {
   .transition(opacity .15s linear);
   opacity: 0;
   &.open {
-    display: block;
     opacity: 1;
   }
 }
@@ -599,7 +598,6 @@ input[type=submit].btn {
   z-index: 1000;
 }
 .modal {
-  display: none;
   position: fixed;
   top: 50%;
   left: 50%;