move clearfix logic back onto clearfix class for ie7

jpvf · Sep 16, 2011 · 39aca91 · 39aca91
1 parent 68f89d1
commit 39aca91
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git 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: Thu Sep 15 22:27:27 PDT 2011
+ * Date: Thu Sep 15 22:36:03 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).
@@ -603,6 +603,16 @@ fieldset legend {
 }
 form .clearfix {
   margin-bottom: 18px;
+  zoom: 1;
+}
+form .clearfix:before, form .clearfix:after {
+  display: table;
+  content: "";
+  zoom: 1;
+  *display: inline;
+}
+form .clearfix:after {
+  clear: both;
 }
 label,
 input,
@@ -942,21 +952,6 @@ textarea[readonly] {
 .inline-inputs span {
   padding: 0 2px 0 1px;
 }
-.input-prepend, .input-append {
-  zoom: 1;
-}
-.input-prepend:before,
-.input-append:before,
-.input-prepend:after,
-.input-append:after {
-  display: table;
-  content: "";
-  zoom: 1;
-  *display: inline;
-}
-.input-prepend:after, .input-append:after {
-  clear: both;
-}
 .input-prepend input, .input-append input {
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;

diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
diff --git a/lib/forms.less b/lib/forms.less
@@ -28,6 +28,7 @@ fieldset {
 // Parent element that clears floats and wraps labels and fields together
 form .clearfix {
   margin-bottom: @baseline;
+  .clearfix()
 }
 
 // Set font for forms
@@ -325,7 +326,6 @@ textarea[readonly] {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
-  .clearfix();
   input {
     .border-radius(0 3px 3px 0);
   }