diff options
| author | Mark Otto <[email protected]> | 2012-01-23 12:21:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-23 12:21:00 -0800 |
| commit | ff113acba88806380b995fba894d77b562ca0e0a (patch) | |
| tree | a56a0498ad12b2b041597522085d8929a7743d83 | |
| parent | ea8f5883fd58ff5e356944e4a93543c05abf2220 (diff) | |
| download | bootstrap-ff113acba88806380b995fba894d77b562ca0e0a.tar.xz bootstrap-ff113acba88806380b995fba894d77b562ca0e0a.zip | |
cut margin in half on default forms
| -rw-r--r-- | bootstrap.css | 5 | ||||
| -rw-r--r-- | bootstrap.min.css | 3 | ||||
| -rw-r--r-- | lib/forms.less | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/bootstrap.css b/bootstrap.css index fc0337f6d..6f2a8c751 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: Mon Jan 23 11:35:22 PST 2012 + * Date: Mon Jan 23 12:20:49 PST 2012 */ article, aside, @@ -896,6 +896,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; } .control-group { + margin-bottom: 9px; +} +.form-horizontal .control-group { margin-bottom: 18px; } .form-horizontal .control-group > label { diff --git a/bootstrap.min.css b/bootstrap.min.css index bee4eb82a..3f6c6a825 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -171,7 +171,8 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;} .form-search label,.form-inline label{display:inline-block;} -.control-group{margin-bottom:18px;} +.control-group{margin-bottom:9px;} +.form-horizontal .control-group{margin-bottom:18px;} .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} .form-horizontal .controls{margin-left:160px;} .form-horizontal .form-actions{padding-left:160px;} diff --git a/lib/forms.less b/lib/forms.less index 85bf26163..bf3dbe64c 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -463,13 +463,16 @@ select:focus:required:invalid { // Margin to space out fieldsets .control-group { - margin-bottom: @baseLineHeight; + margin-bottom: @baseLineHeight / 2; } // Horizontal-specific styles // -------------------------- .form-horizontal { + .control-group { + margin-bottom: @baseLineHeight; + } // Float the labels left .control-group > label { float: left; |