From: Mark Otto <otto@github.com>
Date: Fri, 10 May 2013 00:22:48 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~357^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e4ff73d25e426cf19bb84392510f78e2cd2fd8;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	less/forms.less
---

90e4ff73d25e426cf19bb84392510f78e2cd2fd8
diff --cc less/forms.less
index 4a99a77937,5db5f5cc3d..cc69e935f0
--- a/less/forms.less
+++ b/less/forms.less
@@@ -398,15 -431,18 +394,17 @@@ select:focus:invalid 
    text-shadow: 0 1px 0 #fff;
    background-color: @gray-lighter;
    border: 1px solid #ccc;
+   border-radius: @border-radius-base;
  
 -	&.input-small {
 -	  padding: @padding-small;
 -	  font-size: @font-size-small;
 -    border-radius: @border-radius-small;
 -  }
 +  &.input-small {
 +    padding: @padding-small;
 +    font-size: @font-size-small;
-   }
++    border-radius: @border-radius-small;  }
    &.input-large {
      padding: @padding-large;
      font-size: @font-size-large;
+     border-radius: @border-radius-large;
 -	}
 +  }
  }
  
  // Reset rounded corners