From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 2 Sep 2011 05:54:59 +0000 (-0700)
Subject: Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
X-Git-Tag: v1.2.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0159524413f7a90b90cff50fa07d07b85380845d;p=thirdparty%2Fbootstrap.git

Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
	bootstrap-1.2.0.css
---

0159524413f7a90b90cff50fa07d07b85380845d
diff --cc bootstrap-1.2.0.css
index a24380d914,b10c09558b..7d51eb7e1f
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@@ -6,7 -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  1 22:52:35 PDT 2011
 - * Date: Wed Aug 31 16:27:14 PDT 2011
++ * Date: Thu Sep  1 22:54:55 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).
@@@ -673,24 -670,6 +669,25 @@@ select
    -moz-border-radius: 3px;
    border-radius: 3px;
  }
++/* mini reset for non-html5 file types */
 +input[type=checkbox], input[type=radio] {
 +  width: auto;
 +  padding: 0;
 +  line-height: normal;
 +  height: auto;
 +  margin: 3px 0;
 +}
 +input[type=file] {
 +  border: 0;
 +  padding: 0;
 +  -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;