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

fix a bunch of padding and alignment things for forms

Browse Source
This commit is contained in:
Mark Otto
2014-11-25 18:00:52 -08:00
parent 15d98dc6b7
commit 12be9044f4
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+5 -5
View File
@@ -2028,13 +2028,13 @@ select[multiple].form-group-lg .form-control {
.form-horizontal .checkbox, .form-horizontal .checkbox,
.form-horizontal .radio-inline, .form-horizontal .radio-inline,
.form-horizontal .checkbox-inline { .form-horizontal .checkbox-inline {
padding-top: 1.5rem; padding-top: .6rem;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.form-horizontal .radio, .form-horizontal .radio,
.form-horizontal .checkbox { .form-horizontal .checkbox {
min-height: 25.5px; min-height: 24.6px;
} }
.form-horizontal .form-group { .form-horizontal .form-group {
margin-right: -.75rem; margin-right: -.75rem;
@@ -2042,7 +2042,7 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 48em) { @media (min-width: 48em) {
.form-horizontal .control-label { .form-horizontal .control-label {
padding-top: 1.5rem; padding-top: .6rem;
margin-bottom: 0; margin-bottom: 0;
text-align: right; text-align: right;
} }
@@ -2052,12 +2052,12 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 48em) { @media (min-width: 48em) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 1.9975rem; padding-top: .75rem;
} }
} }
@media (min-width: 48em) { @media (min-width: 48em) {
.form-horizontal .form-group-sm .control-label { .form-horizontal .form-group-sm .control-label {
padding-top: 1.3rem; padding-top: .4rem;
} }
} }
.btn { .btn {
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/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
Vendored
+5 -5
View File
@@ -2028,13 +2028,13 @@ select[multiple].form-group-lg .form-control {
.form-horizontal .checkbox, .form-horizontal .checkbox,
.form-horizontal .radio-inline, .form-horizontal .radio-inline,
.form-horizontal .checkbox-inline { .form-horizontal .checkbox-inline {
padding-top: 1.5rem; padding-top: .6rem;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.form-horizontal .radio, .form-horizontal .radio,
.form-horizontal .checkbox { .form-horizontal .checkbox {
min-height: 25.5px; min-height: 24.6px;
} }
.form-horizontal .form-group { .form-horizontal .form-group {
margin-right: -.75rem; margin-right: -.75rem;
@@ -2042,7 +2042,7 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 48em) { @media (min-width: 48em) {
.form-horizontal .control-label { .form-horizontal .control-label {
padding-top: 1.5rem; padding-top: .6rem;
margin-bottom: 0; margin-bottom: 0;
text-align: right; text-align: right;
} }
@@ -2052,12 +2052,12 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 48em) { @media (min-width: 48em) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 1.9975rem; padding-top: .75rem;
} }
} }
@media (min-width: 48em) { @media (min-width: 48em) {
.form-horizontal .form-group-sm .control-label { .form-horizontal .form-group-sm .control-label {
padding-top: 1.3rem; padding-top: .4rem;
} }
} }
.btn { .btn {
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 -5
View File
@@ -496,13 +496,13 @@ input[type="checkbox"] {
.checkbox-inline { .checkbox-inline {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
padding-top: (@padding-base-vertical + 1); // Default padding plus a border padding-top: (@padding-base-vertical + .1); // Default padding plus a border
} }
// Account for padding we're adding to ensure the alignment and of help text // Account for padding we're adding to ensure the alignment and of help text
// and other content below items // and other content below items
.radio, .radio,
.checkbox { .checkbox {
min-height: (@line-height-computed + (@padding-base-vertical + 1)); min-height: (@line-height-computed + (@padding-base-vertical + .1));
} }
// Make form groups behave like rows // Make form groups behave like rows
@@ -516,7 +516,7 @@ input[type="checkbox"] {
.control-label { .control-label {
text-align: right; text-align: right;
margin-bottom: 0; margin-bottom: 0;
padding-top: (@padding-base-vertical + 1); // Default padding plus a border padding-top: (@padding-base-vertical + .1); // Default padding plus a border
} }
}); });
@@ -535,14 +535,14 @@ input[type="checkbox"] {
.form-group-lg { .form-group-lg {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: ((@padding-lg-vertical * @line-height-lg) + 1); padding-top: @padding-lg-vertical;
} }
} }
} }
.form-group-sm { .form-group-sm {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: (@padding-sm-vertical + 1); padding-top: (@padding-sm-vertical + .1);
} }
} }
} }