kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Mark Otto 2012-01-25 11:21:44 -08:00
parent cfa925cab6
commit d3c5dd4e6a
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap.css vendored
View file

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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, article,
aside, aside,
@ -510,13 +510,17 @@ select,
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.uneditable-textarea {
width: auto;
height: auto;
}
input[type=image], input[type=checkbox], input[type=radio] { input[type=image], input[type=checkbox], input[type=radio] {
width: auto; width: auto;
height: auto; height: auto;
padding: 0; padding: 0;
margin: 3px 0; margin: 3px 0;
*margin-top: 0; *margin-top: 0;
/* IE6-7 */ /* IE7 */
line-height: normal; line-height: normal;
border: none; border: none;
@ -538,6 +542,8 @@ input[type=button], input[type=reset], input[type=submit] {
} }
select, input[type=file] { select, input[type=file] {
height: 27px; height: 27px;
/* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px; *margin-top: 4px;
/* For IE7, add top margin to align select with labels */ /* For IE7, add top margin to align select with labels */

1
bootstrap.min.css vendored
View file

@ -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,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;} 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;} 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=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=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;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}

8
lib/forms.less
View file

@ -63,6 +63,10 @@ select,
border: 1px solid #ccc; border: 1px solid #ccc;
.border-radius(3px); .border-radius(3px);
} }
.uneditable-textarea {
width: auto;
height: auto;
}
// Mini reset for unique input types // Mini reset for unique input types
input[type=image], input[type=image],
@ -72,7 +76,7 @@ input[type=radio] {
height: auto; height: auto;
padding: 0; padding: 0;
margin: 3px 0; margin: 3px 0;
*margin-top: 0; /* IE6-7 */ *margin-top: 0; /* IE7 */
line-height: normal; line-height: normal;
border: none; border: none;
cursor: pointer; cursor: pointer;
@ -99,7 +103,7 @@ input[type=submit] {
// Set the height of select and file controls to match text inputs // Set the height of select and file controls to match text inputs
select, select,
input[type=file] { 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 */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */
line-height: @baseLineHeight * 1.5; line-height: @baseLineHeight * 1.5;
} }