diff --git a/bootstrap.css b/bootstrap.css index 7a538c7176..1556d7704f 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Jan 25 11:47:25 PST 2012 + * Date: Wed Jan 25 11:50:14 PST 2012 */ article, aside, @@ -555,7 +555,7 @@ select { background-color: #ffffff; } select[multiple], select[size] { - height: inherit; + height: auto; } input[type=image] { -webkit-box-shadow: none; diff --git a/bootstrap.min.css b/bootstrap.min.css index 87ea670e09..8174829501 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -101,7 +101,7 @@ input[type=file]{padding:initial;line-height:initial;border:initial;background-c input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} select{width:220px;vertical-align:middle;background-color:#ffffff;} -select[multiple],select[size]{height:inherit;} +select[multiple],select[size]{height:auto;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} .radio,.checkbox{padding-left:18px;} diff --git a/lib/forms.less b/lib/forms.less index 3b35a172c7..355a33a30d 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -118,7 +118,7 @@ select { // Make multiple select elements height not fixed select[multiple], select[size] { - height: inherit; + height: auto; } // Remove shadow from image inputs