Skip to content

B
bootstrap
Commit be4e951b authored by Mark Otto's avatar Mark Otto
Browse files
Options

scope top padding of .form-control-static to be within horizontal forms only; fixes #10927

parent 44b32a30
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
dist/css/bootstrap.css
View file @ be4e951b
...@@ -2104,7 +2104,6 @@ textarea.input-lg { ...@@ -2104,7 +2104,6 @@ textarea.input-lg {
} }
.form-control-static { .form-control-static {
padding-top: 7px;
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -2173,6 +2172,10 @@ textarea.input-lg { ...@@ -2173,6 +2172,10 @@ textarea.input-lg {
clear: both; clear: both;
} }
.form-horizontal .form-control-static {
padding-top: 7px;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .control-label { .form-horizontal .control-label {
text-align: right; text-align: right;
......
dist/css/bootstrap.min.css
View file @ be4e951b
This source diff could not be displayed because it is too large. You can view the blob instead.
less/forms.less
View file @ be4e951b
...@@ -267,7 +267,6 @@ input[type="checkbox"], ...@@ -267,7 +267,6 @@ input[type="checkbox"],
.form-control-static { .form-control-static {
margin-bottom: 0; // Remove default margin from `p` margin-bottom: 0; // Remove default margin from `p`
padding-top: (@padding-base-vertical + 1);
} }
...@@ -354,6 +353,10 @@ input[type="checkbox"], ...@@ -354,6 +353,10 @@ input[type="checkbox"],
.make-row(); .make-row();
} }
.form-control-static {
padding-top: (@padding-base-vertical + 1);
}
// Only right align form labels here when the columns stop stacking // Only right align form labels here when the columns stop stacking
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment