From: Mark Otto <markotto@twitter.com>
Date: Fri, 6 Jul 2012 17:59:46 +0000 (-0700)
Subject: vertically align inline form content
X-Git-Tag: v2.1.0~2^2~225
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc6eaafb00426315a3720324d7fc3a4a33a04ddf;p=thirdparty%2Fbootstrap.git

vertically align inline form content
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1cd4907161..0a3e863937 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1551,6 +1551,7 @@ input.search-query {
   display: inline-block;
   *display: inline;
   margin-bottom: 0;
+  vertical-align: middle;
   *zoom: 1;
 }
 
diff --git a/less/forms.less b/less/forms.less
index f97d6aeef4..1b57b66be4 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -502,6 +502,7 @@ input.search-query {
     display: inline-block;
     .ie7-inline-block();
     margin-bottom: 0;
+    vertical-align: middle;
   }
   // Re-hide hidden elements due to specifity
   .hide {