updated comments in forms.less and added uneditable-textarea class to extend uneditab...

diff --git a/bootstrap.css b/bootstrap.css
index 8069c5d254a6dcac8cb949c626cc574a924d531d..0166a32015bb35c90bb167c2722ef097d4aca0c4 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.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: Wed Jan 25 11:15:41 PST 2012
+ * Date: Wed Jan 25 11:21:22 PST 2012
  */
 article,
 aside,
@@ -510,13 +510,17 @@ select,
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
 input[type=image], input[type=checkbox], input[type=radio] {
   width: auto;
   height: auto;
   padding: 0;
   margin: 3px 0;
   *margin-top: 0;
-  /* IE6-7 */
+  /* IE7 */
 
   line-height: normal;
   border: none;
@@ -538,6 +542,8 @@ input[type=button], input[type=reset], input[type=submit] {
 }
 select, input[type=file] {
   height: 27px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */
 

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 216af09ceb9c4648b05609a40ed64c62e668aded..438305f715620ef805423083979486cb409dff0c 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -95,6 +95,7 @@ legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;li
 label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.uneditable-textarea{width:auto;height:auto;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
 input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}

diff --git a/lib/forms.less b/lib/forms.less
index 100b0ab9155a163cf5f21e840cb03c1f3201f403..178c210181f5e5ef12ebda3007956e35dd35e7c9 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -63,6 +63,10 @@ select,
   border: 1px solid #ccc;
   .border-radius(3px);
 }
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
 
 // Mini reset for unique input types
 input[type=image],
@@ -72,7 +76,7 @@ input[type=radio] {
   height: auto;
   padding: 0;
   margin: 3px 0;
-  *margin-top: 0; /* IE6-7 */
+  *margin-top: 0; /* IE7 */
   line-height: normal;
   border: none;
   cursor: pointer;
@@ -99,7 +103,7 @@ input[type=submit] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type=file] {
-  height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
+  height: @baseLineHeight * 1.5; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
   line-height: @baseLineHeight * 1.5;
 }