0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

Fixes , a reoccurence of

This commit is contained in:
Mark Otto 2013-08-05 11:47:12 -07:00
parent d0d8ab8364
commit a82ca0f9e1
3 changed files with 25 additions and 1 deletions

@ -1649,10 +1649,17 @@ textarea.input-sm {
.form-inline .radio, .form-inline .radio,
.form-inline .checkbox { .form-inline .checkbox {
padding-left: 0;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] {
float: none;
margin-left: 0;
}
.form-horizontal .control-label, .form-horizontal .control-label,
.form-horizontal .radio-inline, .form-horizontal .radio-inline,
.form-horizontal .checkbox-inline { .form-horizontal .checkbox-inline {
@ -2926,10 +2933,17 @@ button.close {
.navbar-form .radio, .navbar-form .radio,
.navbar-form .checkbox { .navbar-form .checkbox {
padding-left: 0;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.navbar-form .radio input[type="radio"],
.navbar-form .checkbox input[type="checkbox"] {
float: none;
margin-left: 0;
}
.navbar-nav > li > .dropdown-menu { .navbar-nav > li > .dropdown-menu {
margin-top: 0; margin-top: 0;
border-top-right-radius: 0; border-top-right-radius: 0;

File diff suppressed because one or more lines are too long

@ -290,10 +290,20 @@ textarea {
.checkbox { .checkbox {
display: inline-block; display: inline-block;
} }
// 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).
.radio, .radio,
.checkbox { .checkbox {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
padding-left: 0;
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
float: none;
margin-left: 0;
} }
} }