diff options
| author | Jacob Thornton <[email protected]> | 2011-10-29 17:08:35 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-10-29 17:08:35 -0700 |
| commit | 9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24 (patch) | |
| tree | b089f69bb5c31d47f9408f11935645a67e4cbd68 /lib/forms.less | |
| parent | 61937a803b96748377dd49d50439d96d68a9e40c (diff) | |
| parent | d3b8a96589ab6dd70fad89413e04c09008c7c133 (diff) | |
| download | bootstrap-9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24.tar.xz bootstrap-9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into dev
Conflicts:
bootstrap.css
bootstrap.min.css
lib/forms.less
Diffstat (limited to 'lib/forms.less')
| -rw-r--r-- | lib/forms.less | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/forms.less b/lib/forms.less index 2075ffd65..e81dca5b4 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -254,7 +254,9 @@ textarea.xxlarge { // This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border .formColumns(@columnSpan: 1) { display: inline-block; + float: none; width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10; + margin-left: 0; } input, textarea { |