From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 22 Aug 2011 03:42:54 +0000 (-0700)
Subject: Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes
X-Git-Tag: v1.1.0~14^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f6f9ec6e05348ab68859ebf043a0d22d8956efc;p=thirdparty%2Fbootstrap.git

Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes

Conflicts:
	lib/forms.less
---

2f6f9ec6e05348ab68859ebf043a0d22d8956efc
diff --cc lib/forms.less
index 6e440feaea,3a847ae841..5903260340
--- a/lib/forms.less
+++ b/lib/forms.less
@@@ -261,14 -257,7 +261,14 @@@ form 
      border-color: @green;
    }
  }
 +
- div.input-prepend {
++.input-prepend {
 +  .add-on {
 +    *margin-top: 1px; /* IE6-7 */
 +  }
 +}
 +
- div.input-append {
+ .input-append {
    input[type=text] {
      float: left;
      .border-radius(3px 0 0 3px);