add input width calculation fix from #408 to the 2.0 branch

diff --git a/bootstrap.css b/bootstrap.css
index 4c4d85aa9e48db7519b76f34e5d9469c2523e806..271c35afc9d168a7c8e358992df00a167f9a5316 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: 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],

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 2a802744cf319d3b150c62496cb32010c9c48c1c..48240411023673fbb46cd9c15d37fe5265f1ace9 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -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;}

diff --git a/lib/forms.less b/lib/forms.less
index 39c2937999b743a24ee9a92810d27c87bcc0171b..5de55e727fb0b06c0b056fdd653fe81b627f98ee 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -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,