Fixes #13872: Always apply padding to .form-control-static for that vertical alignment

dist/css/bootstrap.css

@@ -2621,6 +2621,8 @@ select[multiple].input-lg {
   top: 0;
 }
 .form-control-static {
+  padding-top: 7px;
+  padding-bottom: 7px;
   margin-bottom: 0;
 }
 .help-block {
@@ -2692,10 +2694,6 @@ select[multiple].input-lg {
   margin-right: -15px;
   margin-left: -15px;
 }
-.form-horizontal .form-control-static {
-  padding-top: 7px;
-  padding-bottom: 7px;
-}
 @media (min-width: 768px) {
   .form-horizontal .control-label {
     padding-top: 7px;

less/forms.less

@@ -355,7 +355,11 @@ input[type="checkbox"] {
 // a horizontal form layout.
 
 .form-control-static {
-  margin-bottom: 0; // Remove default margin from `p`
+  // Size it appropriately next to real form controls
+  padding-top: (@padding-base-vertical + 1);
+  padding-bottom: (@padding-base-vertical + 1);
+  // Remove default margin from `p`
+  margin-bottom: 0;
 }
 
 
@@ -484,11 +488,6 @@ input[type="checkbox"] {
     .make-row();
   }
 
-  .form-control-static {
-    padding-top: (@padding-base-vertical + 1);
-    padding-bottom: (@padding-base-vertical + 1);
-  }
-
   // Reset spacing and right align labels, but scope to media queries so that
   // labels on narrow viewports stack the same as a default form example.
   @media (min-width: @screen-sm-min) {