diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e2f5087b39..4b7227a7d1 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index f95e46e166..a8457dc455 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -148,8 +148,8 @@
   .row {
     margin-left: 0;
   }
-  .row > [class*="span"],
-  .row-fluid > [class*="span"] {
+  [class*="span"],
+  .row-fluid [class*="span"] {
     float: none;
     display: block;
     width: auto;
@@ -174,8 +174,11 @@
     -ms-box-sizing: border-box;
     box-sizing: border-box;
   }
+  .input-prepend input,
+  .input-append input,
   .input-prepend input[class*="span"],
   .input-append input[class*="span"] {
+    display: inline-block;
     width: auto;
   }
 }
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 7a3318a8fe..ba34b29a6e 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -100,9 +100,9 @@
   .row {
     margin-left: 0;
   }
-  // Make all columns even
-  .row > [class*="span"],
-  .row-fluid > [class*="span"] {
+  // Make all grid-sized elements block level again
+  [class*="span"],
+  .row-fluid [class*="span"] {
     float: none;
     display: block;
     width: auto;
@@ -125,8 +125,11 @@
     .input-block-level();
   }
   // But don't let it screw up prepend/append inputs
+  .input-prepend input,
+  .input-append input,
   .input-prepend input[class*="span"],
   .input-append input[class*="span"] {
+    display: inline-block; // redeclare so they don't wrap to new lines
     width: auto;
   }