From f3f60b21a6104be999cb04f6414878fc4dea98cd Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 11 Sep 2011 18:09:01 -0700
Subject: [PATCH] oops, double commit last time; apply fixes to make select
 elements line up in IE7 with their labels, but no height fix

---
 bootstrap-1.3.0.css     |  5 ++++-
 bootstrap-1.3.0.min.css |  2 +-
 docs/index.html         | 17 -----------------
 lib/forms.less          |  6 ++----
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index a792c99eae..0c20b8d640 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.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: Sun Sep 11 17:36:01 PDT 2011
+ * Date: Sun Sep 11 18:08:25 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).
@@ -771,6 +771,9 @@ input[type=button], input[type=reset], input[type=submit] {
 select, input[type=file] {
   height: 27px;
   line-height: 27px;
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
 }
 textarea {
   height: auto;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index c92c6f4e13..b2b38bbf86 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -122,7 +122,7 @@ input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:
 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:#fff;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;}
+select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;}
 textarea{height:auto;}
 .uneditable-input{background-color:#fff;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;}
 :-moz-placeholder{color:#bfbfbf;}
diff --git a/docs/index.html b/docs/index.html
index adf58e64f2..110b4f46bd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -940,23 +940,6 @@
       <form>
         <fieldset>
           <legend>Example form legend</legend>
-
-          <table>
-            <thead>
-              <tr>
-                <th>1</th>
-                <th>2</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td>1</td>
-                <td>2</td>
-              </tr>
-            </tbody>
-          </table>
-
-
           <div class="clearfix">
             <label for="xlInput">X-Large input</label>
             <div class="input">
diff --git a/lib/forms.less b/lib/forms.less
index a1fdbd9373..90b8720f03 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -105,11 +105,9 @@ input[type=submit] {
 
 select,
 input[type=file] {
-  height: @baseline * 1.5;
+  height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
   line-height: @baseline * 1.5;
-}
-select {
-  float: left;
+  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
 }
 
 textarea {