diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 14e74c3016..bd2b6ffdbf 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 12b9af84d5..2674c48a6c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -625,15 +625,13 @@ input[type="hidden"] { } .radio.inline, .checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } -.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { - padding-top: 0; -} input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); diff --git a/less/forms.less b/less/forms.less index a8de0f24c6..3f68df01c4 100644 --- a/less/forms.less +++ b/less/forms.less @@ -166,9 +166,11 @@ input[type="hidden"] { } // Radios and checkboxes on same line +// TODO v3: Convert .inline to .control-inline .radio.inline, .checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } @@ -176,11 +178,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; // space out consecutive inline controls } -// But don't forget to remove their padding on first-child -.controls > .radio.inline:first-child, -.controls > .checkbox.inline:first-child { - padding-top: 0; -}