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

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ea03ef5a1af7b5d2d1e029dc3c34bbcadbce530a..c726bf0a3fe09ced72ead62c8c0d611c6cef6989 100644 (file)
--- 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;
 }
 

diff --git a/less/forms.less b/less/forms.less
index 2dc814e2e17d4dc0055fdaf8fa5a6ca139987727..03bec5d3521373d59c5dd5a0601650e84d8abae8 100644 (file)
--- 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