diff options
| author | Mark Otto <[email protected]> | 2013-12-15 15:07:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 15:07:38 -0800 |
| commit | d1f15baa713764440e8335b8dbab580887caaa12 (patch) | |
| tree | 22795d45cb61184ae349c66e47352051a2f7ec0b /less/forms.less | |
| parent | 3b5e0c9a3cae9bfae38253ae153a3426d1f81ad3 (diff) | |
| parent | b04a1de9b097de7f4df95b30df040efe86563e75 (diff) | |
| download | bootstrap-d1f15baa713764440e8335b8dbab580887caaa12.tar.xz bootstrap-d1f15baa713764440e8335b8dbab580887caaa12.zip | |
Merge branch 'master' into pr/11817
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/less/forms.less b/less/forms.less index f7fc5d66c..d2d089c30 100644 --- a/less/forms.less +++ b/less/forms.less @@ -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). |