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

1 files changed, 4 insertions, 8 deletions

diff --git a/lib/forms.less b/lib/forms.less
index 4bdddc3a2..6edf29e53 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -37,12 +37,6 @@ label {
   color: @grayDark;
 }
 
-// Checkboxs and radio buttons
-input[type=checkbox],
-input[type=radio] {
-  cursor: pointer;
-}
-
 // Inputs, Textareas, Selects
 input,
 textarea,
@@ -69,11 +63,13 @@ input[type=radio] {
   *margin-top: 0; /* IE6-7 */
   line-height: normal;
   border: none;
+  cursor: pointer;
 }
 
 // Reset the file input to browser defaults
 input[type=file] {
   background-color: @white;
+  background-color: initial;
   padding: initial;
   border: initial;
   line-height: initial;
@@ -323,11 +319,11 @@ textarea[readonly] {
     display: block;
     width: auto;
     min-width: 16px;
-    height: 18px;
+    height: @baseLineHeight;
     padding: 4px 4px 4px 5px;
     margin-right: -1px;
     font-weight: normal;
-    line-height: 18px;
+    line-height: @baseLineHeight;
     color: @grayLight;
     text-align: center;
     text-shadow: 0 1px 0 @white;