mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-10-13 20:02:24 -07:00
parent 44b32a3036
commit be4e951b7d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+4 -1
View File
@@ -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 {
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
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/forms.less
+4 -1
View File
@@ -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"],
.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 {