mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+2 -4
View File
@@ -2621,6 +2621,8 @@ select[multiple].input-lg {
top: 0; top: 0;
} }
.form-control-static { .form-control-static {
padding-top: 7px;
padding-bottom: 7px;
margin-bottom: 0; margin-bottom: 0;
} }
.help-block { .help-block {
@@ -2692,10 +2694,6 @@ select[multiple].input-lg {
margin-right: -15px; margin-right: -15px;
margin-left: -15px; margin-left: -15px;
} }
.form-horizontal .form-control-static {
padding-top: 7px;
padding-bottom: 7px;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .control-label { .form-horizontal .control-label {
padding-top: 7px; padding-top: 7px;
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/forms.less
+5 -6
View File
@@ -355,7 +355,11 @@ input[type="checkbox"] {
// a horizontal form layout. // a horizontal form layout.
.form-control-static { .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(); .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 // 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. // labels on narrow viewports stack the same as a default form example.
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {