rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #722 from tinyfly/grid-input-size-fix

Browse Source 
Match input grid classes to the new 12-col grid.
This commit is contained in:
Mark Otto 2011-11-29 19:17:12 -08:00
commit 08d0aff19f
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bootstrap.css vendored
View File

@ -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: Fri Nov 25 21:33:58 PST 2011
* Date: Tue Nov 29 11:11:41 CST 2011
*/
html, body {
margin: 0;
@ -657,7 +657,7 @@ select.span2,
.uneditable-input.span2 {
display: inline-block;
float: none;
width: 150px;
width: 130px;
margin-left: 0;
}
input.span3,
@ -666,7 +666,7 @@ select.span3,
.uneditable-input.span3 {
display: inline-block;
float: none;
width: 250px;
width: 210px;
margin-left: 0;
}
input.span4,
@ -675,7 +675,7 @@ select.span4,
.uneditable-input.span4 {
display: inline-block;
float: none;
width: 350px;
width: 290px;
margin-left: 0;
}
input.span5,
@ -684,7 +684,7 @@ select.span5,
.uneditable-input.span5 {
display: inline-block;
float: none;
width: 450px;
width: 370px;
margin-left: 0;
}
input.span6,
@ -693,7 +693,7 @@ select.span6,
.uneditable-input.span6 {
display: inline-block;
float: none;
width: 550px;
width: 450px;
margin-left: 0;
}
input.span7,
@ -702,7 +702,7 @@ select.span7,
.uneditable-input.span7 {
display: inline-block;
float: none;
width: 650px;
width: 530px;
margin-left: 0;
}
input.span8,
@ -711,7 +711,7 @@ select.span8,
.uneditable-input.span8 {
display: inline-block;
float: none;
width: 750px;
width: 610px;
margin-left: 0;
}
input.span9,
@ -720,7 +720,7 @@ select.span9,
.uneditable-input.span9 {
display: inline-block;
float: none;
width: 850px;
width: 690px;
margin-left: 0;
}
input.span10,
@ -729,7 +729,7 @@ select.span10,
.uneditable-input.span10 {
display: inline-block;
float: none;
width: 950px;
width: 770px;
margin-left: 0;
}
input.span11,
@ -738,7 +738,7 @@ select.span11,
.uneditable-input.span11 {
display: inline-block;
float: none;
width: 1050px;
width: 850px;
margin-left: 0;
}
input.span12,
@ -747,7 +747,7 @@ select.span12,
.uneditable-input.span12 {
display: inline-block;
float: none;
width: 1150px;
width: 930px;
margin-left: 0;
}
input.span13,
@ -756,7 +756,7 @@ select.span13,
.uneditable-input.span13 {
display: inline-block;
float: none;
width: 1250px;
width: 1010px;
margin-left: 0;
}
input.span14,
@ -765,7 +765,7 @@ select.span14,
.uneditable-input.span14 {
display: inline-block;
float: none;
width: 1350px;
width: 1090px;
margin-left: 0;
}
input.span15,
@ -774,7 +774,7 @@ select.span15,
.uneditable-input.span15 {
display: inline-block;
float: none;
width: 1450px;
width: 1170px;
margin-left: 0;
}
input.span16,
@ -783,7 +783,7 @@ select.span16,
.uneditable-input.span16 {
display: inline-block;
float: none;
width: 1550px;
width: 1250px;
margin-left: 0;
}
input[disabled],

30
bootstrap.min.css vendored
View File

@ -111,21 +111,21 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado
.input-xlarge{width:270px;}
.input-xxlarge{width:530px;}
input.span1,textarea.span1,select.span1,.uneditable-input.span1{display:inline-block;float:none;width:50px;margin-left:0;}
input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:150px;margin-left:0;}
input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:250px;margin-left:0;}
input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:350px;margin-left:0;}
input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:450px;margin-left:0;}
input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:550px;margin-left:0;}
input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:650px;margin-left:0;}
input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:750px;margin-left:0;}
input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:850px;margin-left:0;}
input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:950px;margin-left:0;}
input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:1050px;margin-left:0;}
input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:1150px;margin-left:0;}
input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1250px;margin-left:0;}
input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1350px;margin-left:0;}
input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1450px;margin-left:0;}
input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1550px;margin-left:0;}
input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:130px;margin-left:0;}
input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:210px;margin-left:0;}
input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:290px;margin-left:0;}
input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:370px;margin-left:0;}
input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:450px;margin-left:0;}
input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:530px;margin-left:0;}
input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:610px;margin-left:0;}
input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:690px;margin-left:0;}
input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:770px;margin-left:0;}
input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:850px;margin-left:0;}
input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:930px;margin-left:0;}
input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1010px;margin-left:0;}
input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1090px;margin-left:0;}
input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1170px;margin-left:0;}
input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1250px;margin-left:0;}
input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;}
form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}

2
lib/forms.less
View File

@ -145,7 +145,7 @@ select:focus {
.formColumns(@columnSpan: 1) {
display: inline-block;
float: none;
width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
margin-left: 0;
}
input,