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

2 files changed, 18 insertions, 8 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 4d104846b..2590aadf8 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -835,6 +835,17 @@
     display: inline-block;
     width: auto;
   }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
 }
 
 @media (max-width: 480px) {
@@ -866,15 +877,9 @@
     padding-left: 10px;
   }
   .modal {
-    position: fixed;
     top: 10px;
     right: 10px;
     left: 10px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
   }
   .modal-header .close {
     padding: 10px;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5525614d6..b0c966d22 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4715,6 +4715,11 @@ input[type="submit"].btn.btn-mini {
   margin-top: 2px;
 }
 
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
 .modal-body {
   max-height: 400px;
   padding: 15px;
@@ -5498,11 +5503,11 @@ a.badge:hover {
 }
 
 .hide {
-  display: none !important;
+  display: none;
 }
 
 .show {
-  display: block !important;
+  display: block;
 }
 
 .invisible {