root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #11402: Updated fix for select.form-control width in inline-forms

This commit is contained in:
Mark Otto 2013-12-15 14:52:49 -08:00
parent 24eee65c25
commit b04a1de9b0
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@ -1871,6 +1871,9 @@ textarea.input-lg {
.form-inline select.form-control {
width: auto;
}
.form-inline > select.form-control {
width: auto;
}
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
@ -3786,6 +3789,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-form select.form-control {
width: auto;
}
.navbar-form > select.form-control {
width: auto;
}
.navbar-form .radio,
.navbar-form .checkbox {
display: inline-block;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
less/forms.less
View File

@ -311,6 +311,11 @@ input[type="checkbox"],
width: auto;
}
// Override `width: 100%;` when not within a `.form-group`
> select.form-control {
width: auto;
}
// Remove default margin on radios/checkboxes that were used for stacking, and
// then undo the floating of radios and checkboxes to match (which also avoids
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).