diff options
| author | Jacob Thornton <[email protected]> | 2012-01-23 15:06:56 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-23 15:06:56 -0800 |
| commit | 74521e835489066d58813c960bc98d1713ea6074 (patch) | |
| tree | 487e40dd09ab1120130dc64b4292eb3e57f0eec2 /lib/forms.less | |
| parent | f764aee4b919c28974dba7b91edac9a04172ba25 (diff) | |
| parent | a074087034716804610637a5ad9cc0447a2cccb2 (diff) | |
| download | bootstrap-74521e835489066d58813c960bc98d1713ea6074.tar.xz bootstrap-74521e835489066d58813c960bc98d1713ea6074.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
Diffstat (limited to 'lib/forms.less')
| -rw-r--r-- | lib/forms.less | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/forms.less b/lib/forms.less index bdc6e3e07..be53c60cb 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -8,17 +8,25 @@ // Make all forms have space below them form { - margin-bottom: @baseLineHeight; + margin: 0 0 @baseLineHeight; +} + +fieldset { + padding: 0; + margin: 0; + border: 0; } // Groups of fields with labels on top (legends) legend { display: block; width: 100%; + padding: 0; margin-bottom: @baseLineHeight * 1.5; font-size: @baseFontSize * 1.5; line-height: @baseLineHeight * 2; color: @grayDark; + border: 0; border-bottom: 1px solid #eee; -webkit-margin-collapse: separate; } @@ -26,6 +34,7 @@ legend { // Set font for forms label, input, +button, select, textarea { #font > .sans-serif(@baseFontSize,normal,@baseLineHeight); @@ -454,13 +463,17 @@ select:focus:required:invalid { // Margin to space out fieldsets .control-group { - margin-bottom: @baseLineHeight; + margin-bottom: @baseLineHeight / 2; } // Horizontal-specific styles // -------------------------- .form-horizontal { + // Increase spacing between groups + .control-group { + margin-bottom: @baseLineHeight; + } // Float the labels left .control-group > label { float: left; |