rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

make inline and search form labels inline-block

Browse Source
This commit is contained in:
Mark Otto 2012-01-14 16:38:40 -08:00
parent ceb6836e03
commit a40b2a636c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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: Sat Jan 14 16:23:58 PST 2012 * Date: Sat Jan 14 16:38:32 PST 2012
*/ */
html, body { html, body {
margin: 0; margin: 0;
@ -957,6 +957,9 @@ input::-webkit-input-placeholder {
display: inline-block; display: inline-block;
margin-bottom: 0; margin-bottom: 0;
} }
.search-form label, .inline-form label {
display: inline-block;
}
.control-group { .control-group {
margin-bottom: 18px; margin-bottom: 18px;
} }

1
bootstrap.min.css vendored
View File

@ -170,6 +170,7 @@ input::-webkit-input-placeholder{color:#999999;}
.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
.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;}
.search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;} .search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;}
.search-form label,.inline-form label{display:inline-block;}
.control-group{margin-bottom:18px;} .control-group{margin-bottom:18px;}
.control-group>label{font-weight:bold;} .control-group>label{font-weight:bold;}
.horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} .horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;}

4
lib/forms.less
View File

@ -452,6 +452,10 @@ input::-webkit-input-placeholder {
margin-bottom: 0; margin-bottom: 0;
} }
} }
.search-form label,
.inline-form label {
display: inline-block;
}
// Margin to space out fieldsets // Margin to space out fieldsets
.control-group { .control-group {