diff options
| author | Mark Otto <[email protected]> | 2012-07-30 15:38:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-30 15:38:36 -0700 |
| commit | 364dbb7931393cb8fa796d75ec1f32a757d335e1 (patch) | |
| tree | f9238f37749ababf839dfcead341766224000911 | |
| parent | be8d5243f4942a83d9c3e08c5d9f4419536c72c2 (diff) | |
| download | bootstrap-364dbb7931393cb8fa796d75ec1f32a757d335e1.tar.xz bootstrap-364dbb7931393cb8fa796d75ec1f32a757d335e1.zip | |
fixes #3665: ensure inputs in a fluid row maintain grid sizing
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/forms.less | 4 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 19 |
3 files changed, 27 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dd9b96bc1..59cf07579 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1165,6 +1165,10 @@ textarea[class*="span"], .input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"], .input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] { display: inline-block; diff --git a/less/forms.less b/less/forms.less index 0c913b952..d127a5e9a 100644 --- a/less/forms.less +++ b/less/forms.less @@ -279,6 +279,10 @@ textarea[class*="span"], .input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"], .input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] { display: inline-block; diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 3ded955bf..71de6cce7 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -796,6 +796,25 @@ </div><!--/span--> </div><!--/row--> </div> + +<br> + +<h4>Inline form in fluid row</h4> + +<div class="row-fluid"> + <div class="span12"> + <form class="form-inline"> + <input type="text" class="span3" placeholder="Email"> + <input type="password" class="span3" placeholder="Password"> + <label class="checkbox"> + <input type="checkbox"> Remember me + </label> + <button type="submit" class="btn">Sign in</button> + </form> + </div> +</div> + + <br> |