diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 9f32f08085..a5d9ff4267 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -169,11 +169,15 @@
   }
   [class*="span"],
   .row-fluid [class*="span"] {
-    display: inline-block;
+    display: block;
     float: none;
     width: auto;
     margin-left: 0;
   }
+  .row-fluid .input-prepend [class*="span"],
+  .row-fluid .input-append [class*="span"] {
+    display: inline-block;
+  }
   .input-large,
   .input-xlarge,
   .input-xxlarge,
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 42d1907d69..549c4d37e1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -802,6 +802,10 @@ textarea {
   width: 210px;
 }
 
+textarea {
+  height: auto;
+}
+
 textarea,
 input[type="text"],
 input[type="password"],
diff --git a/less/forms.less b/less/forms.less
index 606446638e..582bb413ba 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -94,6 +94,10 @@ input,
 textarea {
   width: 210px;
 }
+// Reset height since textareas have rows
+textarea {
+  height: auto;
+}
 // Everything else
 textarea,
 input[type="text"],
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index e35e45d892..fc422d3a25 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -120,10 +120,14 @@
   [class*="span"],
   .row-fluid [class*="span"] {
     float: none;
-    display: inline-block;
+    display: block;
     width: auto;
     margin-left: 0;
   }
+  .row-fluid .input-prepend [class*="span"],
+  .row-fluid .input-append [class*="span"] {
+    display: inline-block;
+  }
 
   // FORM FIELDS
   // -----------