diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8b74593874..02266b313c 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bdf6a771ff..634ea7a53b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -791,7 +791,7 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input {
+.uneditable-input[class*="span"] {
   float: none;
   margin-left: 0;
 }
@@ -1045,7 +1045,8 @@ select:focus:required:invalid:focus {
   margin-right: -1px;
 }
 .input-append input,
-.input-append select .uneditable-input {
+.input-append select,
+.input-append .uneditable-input {
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
diff --git a/docs/css-tests.html b/docs/css-tests.html
index 081b27a570..99ea083385 100644
--- a/docs/css-tests.html
+++ b/docs/css-tests.html
@@ -84,6 +84,10 @@
     margin-bottom: 36px;
   }
 
+  h4 {
+    margin-bottom: 5px;
+  }
+
   /* colgroup tests */
   .col1 {
     background-color: rgba(255,0,0,.1);
@@ -96,6 +100,7 @@
   }
 </style>
 
+
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
@@ -103,6 +108,11 @@
   <p class="lead">One stop shop for quick debugging and edge-case tests of CSS.</p>
 </header>
 
+
+
+<!-- Tables
+================================================== -->
+
 <div class="page-header">
   <h1>Tables</h1>
 </div>
@@ -269,6 +279,52 @@
 </div><!--/row-->
 
 
+
+<!-- Forms
+================================================== -->
+
+<div class="page-header">
+  <h1>Forms</h1>
+</div>
+
+<div class="row">
+  <div class="span4">
+    <h4>Prepend and append on inputs</h4>
+    <form>
+      <div class="controls">
+        <div class="input-prepend">
+          <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-append">
+          <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-prepend input-append">
+          <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
+        </div>
+      </div>
+    </form>
+  </div><!--/span-->
+  <div class="span6">
+    <h4>Prepend and append with uneditable</h4>
+    <form>
+      <div class="input-prepend">
+        <span class="add-on">$</span><span class="span2 uneditable-input">Some value here</span>
+      </div>
+      <div class="input-append">
+        <span class="span2 uneditable-input">Some value here</span><span class="add-on">.00</span>
+      </div>
+    </form>
+
+  </div><!--/span-->
+</div><!--/row-->
+
+
+
+
      <!-- Footer
       ================================================== -->
       <footer class="footer">
diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache
index 6f460569dd..0220d733b1 100644
--- a/docs/templates/pages/css-tests.mustache
+++ b/docs/templates/pages/css-tests.mustache
@@ -8,6 +8,10 @@
     margin-bottom: 36px;
   }
 
+  h4 {
+    margin-bottom: 5px;
+  }
+
   /* colgroup tests */
   .col1 {
     background-color: rgba(255,0,0,.1);
@@ -20,6 +24,7 @@
   }
 </style>
 
+
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
@@ -27,6 +32,11 @@
   <p class="lead">{{_i}}One stop shop for quick debugging and edge-case tests of CSS.{{/i}}</p>
 </header>
 
+
+
+<!-- Tables
+================================================== -->
+
 <div class="page-header">
   <h1>Tables</h1>
 </div>
@@ -191,3 +201,49 @@
     </table>
   </div><!--/span-->
 </div><!--/row-->
+
+
+
+<!-- Forms
+================================================== -->
+
+<div class="page-header">
+  <h1>Forms</h1>
+</div>
+
+<div class="row">
+  <div class="span4">
+    <h4>Prepend and append on inputs</h4>
+    <form>
+      <div class="controls">
+        <div class="input-prepend">
+          <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-append">
+          <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-prepend input-append">
+          <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
+        </div>
+      </div>
+    </form>
+  </div><!--/span-->
+  <div class="span6">
+    <h4>Prepend and append with uneditable</h4>
+    <form>
+      <div class="input-prepend">
+        <span class="add-on">$</span><span class="span2 uneditable-input">Some value here</span>
+      </div>
+      <div class="input-append">
+        <span class="span2 uneditable-input">Some value here</span><span class="add-on">.00</span>
+      </div>
+    </form>
+
+  </div><!--/span-->
+</div><!--/row-->
+
+
diff --git a/less/forms.less b/less/forms.less
index 83e1013bfa..af1c7eecc7 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -243,7 +243,7 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input {
+.uneditable-input[class*="span"] {
   float: none;
   margin-left: 0;
 }
@@ -408,7 +408,7 @@ select:focus:required:invalid {
 }
 .input-append {
   input,
-  select
+  select,
   .uneditable-input {
     .border-radius(3px 0 0 3px);
   }