rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2014-06-19 18:33:41 -07:00
parent 166b66d08a
commit 1e53dcd137
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@ -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;

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

11
less/forms.less
View File

@ -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) {