Merge branch 'master' into panels_and_tables

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

1 files changed, 8 insertions, 3 deletions

diff --git a/less/forms.less b/less/forms.less
index d97993318..f607b8509 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -133,9 +133,10 @@ output {
   .placeholder();
 
   // Disabled and read-only inputs
-  // Note: HTML5 says that controls under a fieldset > legend:first-child won't
-  // be disabled if the fieldset is disabled. Due to implementation difficulty,
-  // we don't honor that edge case; we style them as disabled anyway.
+  //
+  // HTML5 says that controls under a fieldset > legend:first-child won't be
+  // disabled if the fieldset is disabled. Due to implementation difficulty, we
+  // don't honor that edge case; we style them as disabled anyway.
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
@@ -348,6 +349,10 @@ input[type="checkbox"],
       width: auto; // Prevent labels from stacking above inputs in `.form-group`
       vertical-align: middle;
     }
+    // Input groups need that 100% width though
+    .input-group > .form-control {
+      width: 100%;
+    }
 
     .control-label {
       margin-bottom: 0;