remove fixed height from select elements for IE7

diff --git a/bootstrap.css b/bootstrap.css
index 1bc26041b79be2fe251798c1cc4a30c4e956b17b..276ee25406cb4a1162f3f5d25a022e31a3fef45e 100644 (file)
--- 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: Fri Oct 28 18:57:30 PDT 2011
+ * Date: Mon Oct 31 23:18:19 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -668,6 +668,7 @@ input[type=button], input[type=reset], input[type=submit] {
 }
 select, input[type=file] {
   height: 27px;
+  *height: auto;
   line-height: 27px;
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */

diff --git a/bootstrap.min.css b/bootstrap.min.css
index c6a99a74e6accb8b5cbcaadca4329d4bbca167b1..e1db4bce7719127d3c762b66bccb2994ee539f15 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -116,7 +116,7 @@ select{padding:initial;}
 input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;}
 input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
-select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;}
+select,input[type=file]{height:27px;*height:auto;line-height:27px;*margin-top:4px;}
 select[multiple]{height:inherit;background-color:#ffffff;}
 textarea{height:auto;}
 .uneditable-input{background-color:#ffffff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}

diff --git a/docs/index.html b/docs/index.html
index e271cd3125bf9963beaf0e19475f5f756ab5bdaa..18c72fe31b94d29e8cb0682b6cbbe100c21d3880 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -175,7 +175,7 @@
     <div class="span12">
       <h3>Example grid markup</h3>
       <p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.</p>
-<pre class="prettyprint prettyprint-dark linenums">
+<pre class="prettyprint linenums">
 &lt;div class="row"&gt;
   &lt;div class="span6"&gt;
     ...
@@ -1080,7 +1080,7 @@
           <div class="clearfix">
             <label for="multiSelect">Multiple select</label>
             <div class="input">
-              <select class="medium" multiple="multiple" name="multiSelect" id="multiSelect">
+              <select class="medium" size="5" multiple="multiple" name="multiSelect" id="multiSelect">
                 <option>1</option>
                 <option>2</option>
                 <option>3</option>

diff --git a/lib/forms.less b/lib/forms.less
index 2075ffd6599d5ce51aa3cb15632cbc314ec5b866..eee1faad048694d23821fbe82090975f8ae1ce79 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -112,6 +112,7 @@ input[type=submit] {
 select,
 input[type=file] {
   height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
+  *height: auto; // Reset for IE7
   line-height: @baseline * 1.5;
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
 }