Commit 12be9044 authored by Mark Otto's avatar Mark Otto

fix a bunch of padding and alignment things for forms

parent 15d98dc6
...@@ -2028,13 +2028,13 @@ select[multiple].form-group-lg .form-control { ...@@ -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 { ...@@ -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 { ...@@ -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 {
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2028,13 +2028,13 @@ select[multiple].form-group-lg .form-control { ...@@ -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 { ...@@ -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 { ...@@ -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 {
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -496,13 +496,13 @@ input[type="checkbox"] { ...@@ -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"] { ...@@ -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"] { ...@@ -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);
} }
} }
} }
......
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