Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

fat · fat · commit 4c5320b18fb2 · 2011-09-12T14:29:29.000-07:00
Conflicts:
	bootstrap-1.3.0.css
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.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: Mon Sep 12 14:28:15 PDT 2011
+ * Date: Mon Sep 12 14:29:06 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).
@@ -2046,7 +2046,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 1000;
+  z-index: 10000;
 }
 .modal-backdrop.fade {
   opacity: 0;
@@ -2061,7 +2061,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 2000;
+  z-index: 11000;
   width: 560px;
   margin: -250px 0 0 -250px;
   background-color: #ffffff;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
diff --git a/docs/index.html b/docs/index.html
@@ -99,7 +99,7 @@ <h6>Use it with Less</h6>
             <h6>Fork on GitHub</h6>
             <p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
             <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
-            <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v1.2.0</a></p>
+            <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v1.3.0</a></p>
           </div>
         </div><!-- /row -->
       </div>
diff --git a/lib/patterns.less b/lib/patterns.less
@@ -736,7 +736,7 @@ input[type=submit].btn {
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 1000;
+  z-index: 10000;
 }
 
 .modal-backdrop, .modal-backdrop.fade.in {
@@ -747,7 +747,7 @@ input[type=submit].btn {
   position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 2000;
+  z-index: 11000;
   width: 560px;
   margin: -250px 0 0 -250px;
   background-color: @white;
