diff options
| author | Mark Otto <[email protected]> | 2012-01-14 16:38:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-14 16:38:40 -0800 |
| commit | a40b2a636c908859c2bb7434f0c050be2dc7e70e (patch) | |
| tree | 46ffcdcacc5187a8e480d1bcad2cae7411f16053 | |
| parent | ceb6836e03b03c757578c9e5614f535d9be2ad7f (diff) | |
| download | bootstrap-a40b2a636c908859c2bb7434f0c050be2dc7e70e.tar.xz bootstrap-a40b2a636c908859c2bb7434f0c050be2dc7e70e.zip | |
make inline and search form labels inline-block
| -rw-r--r-- | bootstrap.css | 5 | ||||
| -rw-r--r-- | bootstrap.min.css | 1 | ||||
| -rw-r--r-- | lib/forms.less | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css index c5d011b7e..8d7b08a35 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: Sat Jan 14 16:23:58 PST 2012 + * Date: Sat Jan 14 16:38:32 PST 2012 */ html, body { margin: 0; @@ -957,6 +957,9 @@ input::-webkit-input-placeholder { display: inline-block; margin-bottom: 0; } +.search-form label, .inline-form label { + display: inline-block; +} .control-group { margin-bottom: 18px; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 637c31ad8..5341d3595 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -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;} .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 label,.inline-form label{display:inline-block;} .control-group{margin-bottom:18px;} .control-group>label{font-weight:bold;} .horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} diff --git a/lib/forms.less b/lib/forms.less index 505331044..ed97d8dd0 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -452,6 +452,10 @@ input::-webkit-input-placeholder { margin-bottom: 0; } } +.search-form label, +.inline-form label { + display: inline-block; +} // Margin to space out fieldsets .control-group { |