remove fixed height from select elements for IE7

tanitall · Nov 1, 2011 · 98007b8 · 98007b8
1 parent 61937a8
commit 98007b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
diff --git a/docs/index.html b/docs/index.html
@@ -175,7 +175,7 @@ <h2>Default grid</h2>
     <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 @@ <h2>Default styles</h2>
           <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
@@ -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 */
 }