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

3 files changed, 17 insertions, 4 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 3936d8c20..e91f25539 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -24,9 +24,9 @@
   }
   .modal {
     position: absolute;
-    top: 20px;
-    left: 20px;
-    right: 20px;
+    top: 10px;
+    left: 10px;
+    right: 10px;
     width: auto;
     margin: 0;
   }
@@ -35,6 +35,10 @@
   }
   .modal-header .close {
     padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
   }
 }
 @media (max-width: 768px) {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cd0d620bf..7a5568041 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1986,7 +1986,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 41029ded1..0b221e3b2 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -723,6 +723,15 @@ form.well {
     word-wrap: break-word;
     word-break: break-all;
   }
+
+  /* Modal example */
+  .modal-example .modal {
+    position: relative;
+    top: auto;
+    right: auto;
+    bottom: auto;
+    left: auto;
+  }
 }