From 2b22c0c56efb86c213884897f14383f45e1414b3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Aug 2012 16:00:36 -0700 Subject: [PATCH] fixes #4438: button groups in inline forms now render inline --- docs/assets/css/bootstrap.css | 4 +++- less/forms.less | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ea03ef5a1a..c726bf0a3f 100644 --- 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 2dc814e2e1..03bec5d352 100644 --- 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