diff options
| author | Mark Otto <[email protected]> | 2011-10-10 19:44:06 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-10 19:44:06 -0700 |
| commit | 70b1a6b56213bf9317c62784cd1a45c1c7290bb5 (patch) | |
| tree | be9cb79be998306207ff0bf29570d3b160284c72 | |
| parent | c85e93cd9045ee00c29130bcb6d75d78d033ef5d (diff) | |
| parent | 12cb0822e856c46805c7d25652e1d273ce591fc1 (diff) | |
| download | bootstrap-70b1a6b56213bf9317c62784cd1a45c1c7290bb5.tar.xz bootstrap-70b1a6b56213bf9317c62784cd1a45c1c7290bb5.zip | |
Merge pull request #408 from tinyfly/grid-input-size-fix
adjust width calculations for formColumns to fix issue #404
| -rw-r--r-- | bootstrap.css | 2 | ||||
| -rw-r--r-- | lib/forms.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap.css b/bootstrap.css index fc0edcdd9..a778eb808 100644 --- 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 0da4037df..fed2c5608 100644 --- 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, |