Merge branch '3.0.0-wip' into glyphicons-LESS-fixes

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 18 insertions, 11 deletions

diff --git a/less/forms.less b/less/forms.less
index c59cdd4d7..0118e242c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -326,21 +326,28 @@ input[type="checkbox"],
 // Horizontal forms are built on grid classes and allow you to create forms with
 // labels on the left and inputs on the right.
 
-.form-horizontal .control-label,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
-  padding-top: @padding-base-vertical;
-}
-
 .form-horizontal {
+
+  // Consistent vertical alignment of labels, radios, and checkboxes
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline {
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-top: (@padding-base-vertical + 1); // Default padding plus a border
+  }
+
+  // Make form groups behave like rows
   .form-group {
     .make-row();
   }
-}
 
-// Only right align form labels here when the columns stop stacking
-@media (min-width: @screen-tablet) {
-  .form-horizontal .control-label {
-    text-align: right;
+  // Only right align form labels here when the columns stop stacking
+  @media (min-width: @screen-tablet) {
+    .control-label {
+      text-align: right;
+    }
   }
 }