0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

cut margin in half on default forms

This commit is contained in:
Mark Otto 2012-01-23 12:21:00 -08:00
parent ea8f5883fd
commit ff113acba8
3 changed files with 10 additions and 3 deletions

5
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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, article,
aside, aside,
@ -896,6 +896,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
display: inline-block; display: inline-block;
} }
.control-group { .control-group {
margin-bottom: 9px;
}
.form-horizontal .control-group {
margin-bottom: 18px; margin-bottom: 18px;
} }
.form-horizontal .control-group > label { .form-horizontal .control-group > label {

3
bootstrap.min.css vendored
View File

@ -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;} .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 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;} .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 .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
.form-horizontal .controls{margin-left:160px;} .form-horizontal .controls{margin-left:160px;}
.form-horizontal .form-actions{padding-left:160px;} .form-horizontal .form-actions{padding-left:160px;}

View File

@ -463,13 +463,16 @@ select:focus:required:invalid {
// Margin to space out fieldsets // Margin to space out fieldsets
.control-group { .control-group {
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight / 2;
} }
// Horizontal-specific styles // Horizontal-specific styles
// -------------------------- // --------------------------
.form-horizontal { .form-horizontal {
.control-group {
margin-bottom: @baseLineHeight;
}
// Float the labels left // Float the labels left
.control-group > label { .control-group > label {
float: left; float: left;