scope top padding of .form-control-static to be within horizontal for…

…ms only; fixes #10927
twbs · Oct 14, 2013 · be4e951 · be4e951
1 parent 44b32a3
commit be4e951
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -2104,7 +2104,6 @@ textarea.input-lg {
 }
 
 .form-control-static {
-  padding-top: 7px;
   margin-bottom: 0;
 }
 
@@ -2173,6 +2172,10 @@ textarea.input-lg {
   clear: both;
 }
 
+.form-horizontal .form-control-static {
+  padding-top: 7px;
+}
+
 @media (min-width: 768px) {
   .form-horizontal .control-label {
     text-align: right;

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/forms.less b/less/forms.less
@@ -267,7 +267,6 @@ input[type="checkbox"],
 
 .form-control-static {
   margin-bottom: 0; // Remove default margin from `p`
-  padding-top: (@padding-base-vertical + 1);
 }
 
 
@@ -354,6 +353,10 @@ input[type="checkbox"],
     .make-row();
   }
 
+  .form-control-static {
+    padding-top: (@padding-base-vertical + 1);
+  }
+
   // Only right align form labels here when the columns stop stacking
   @media (min-width: @screen-sm-min) {
     .control-label {