close #1628 to add padding to all inline checkboxes/radios

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 14e74c30165c28c6b4463d98e51fe6f06371bbfe..bd2b6ffdbf35896063aa37a9a65c91d302f5d51a 100644 (file)
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 12b9af84d565502ea804c94b863bb40666517c9a..2674c48a6c4b8400595ec5ce0e6f27bb8720a752 100644 (file)
--- 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 a8de0f24c66a6f9dc04f470c7099200c696302f2..3f68df01c4f1b43e7f511cd15b8d9540281954f3 100644 (file)
--- 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;
-}