diff options
| author | Jacob Thornton <[email protected]> | 2011-11-30 22:05:49 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-11-30 22:05:49 -0800 |
| commit | b1cba98aab5ee2d0576bbbbb92ba3488516290eb (patch) | |
| tree | cb938e0ba8f666ffbd8e6436b8e3b4fb1490adc4 /lib/forms.less | |
| parent | dc628c9115b74e49940c0cc200a8914232c9d2a2 (diff) | |
| parent | bc51c15709469fd0c2e78886a15e849626a8f191 (diff) | |
| download | bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.tar.xz bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'lib/forms.less')
| -rw-r--r-- | lib/forms.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/forms.less b/lib/forms.less index 39c293799..e85b9f201 100644 --- 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, @@ -220,15 +220,15 @@ textarea[readonly] { } } // Error -form .clearfix.error { +.control-group.error { .formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%)); } // Warning -form .clearfix.warning { +.control-group.warning { .formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%)); } // Success -form .clearfix.success { +.control-group.success { .formFieldState(#468847, #57a957, lighten(#57a957, 30%)); } |