diff options
| author | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
| commit | cbb291b8ab316c3c0103da3c7b7a2c73596cfef2 (patch) | |
| tree | e632dc37d1f3dda4e91a06d4f671313a7e476187 /lib/forms.less | |
| parent | b36df463108e2e4df8c389a06f577823564788d9 (diff) | |
| parent | 08d0aff19f8ad8fa2a9cfa389b8753c4525ea99c (diff) | |
| download | bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.tar.xz bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
bootstrap.min.css
Diffstat (limited to 'lib/forms.less')
| -rw-r--r-- | lib/forms.less | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/forms.less b/lib/forms.less index 845eec185..5de55e727 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -1,7 +1,6 @@ -/* Forms.less - * Base styles for various input types, form layouts, and states - * ------------------------------------------------------------- */ - +// Forms.less +// Base styles for various input types, form layouts, and states +// ------------------------------------------------------------- // GENERAL STYLES @@ -146,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, |