adjust width calculations for formColumns to fix issue #404

diff --git a/bootstrap.css b/bootstrap.css
index fc0edcdd98b150fcc36cdbc1edd009ab0c14ab7e..a778eb8085b1342c7479d639ed4831e56f8407dd 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: Tue Oct  4 21:26:21 PDT 2011
+ * Date: Mon Oct 10 14:31:07 CDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

diff --git a/lib/forms.less b/lib/forms.less
index 0da4037df7cf55d9d7b2060d7db2d2a829418401..fed2c56086cebbbe01989389d3ecc7f097031e27 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -236,7 +236,7 @@ textarea.xxlarge {
 .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,