fixes #4438: button groups in inline forms now render inline

2b22c0c5 · Mark Otto · 9e6322db · 2b22c0c5 · 2b22c0c5
Commit 2b22c0c5 authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 2 deletions
+6 -2
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1651,7 +1651,9 @@ input.search-query {
 }
 .form-search label,
-.form-inline label {
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
  display: inline-block;
 }

--- a/less/forms.less
+++ b/less/forms.less
@@ -551,7 +551,9 @@ input.search-query {
  }
 }
 .form-search label,
-.form-inline label {
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
  display: inline-block;
 }
 // Remove margin for input-prepend/-append