Fixes twbs#11402: Set width: auto; to select.form-control within .for…

…m-inline
20111564 · Nov 30, 2013 · 7aa6b41 · 7aa6b41
1 parent d2f8b53
commit 7aa6b41
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -2180,6 +2180,9 @@ textarea.input-lg {
   .form-inline .form-control {
     display: inline-block;
   }
+  .form-inline select.form-control {
+    width: auto;
+  }
   .form-inline .radio,
   .form-inline .checkbox {
     display: inline-block;
@@ -4568,6 +4571,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   .navbar-form .form-control {
     display: inline-block;
   }
+  .navbar-form select.form-control {
+    width: auto;
+  }
   .navbar-form .radio,
   .navbar-form .checkbox {
     display: inline-block;

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/forms.less b/less/forms.less
@@ -309,6 +309,11 @@ input[type="checkbox"],
       display: inline-block;
     }
 
+    // Override `width: 100%;` when not within a `.form-group`
+    select.form-control {
+      width: auto;
+    }
+
     // Remove default margin on radios/checkboxes that were used for stacking, and
     // then undo the floating of radios and checkboxes to match (which also avoids
     // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).