root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #13989: Don't extend the input sizes; manually chain the selectors

This commit is contained in:
Mark Otto 2014-07-02 23:14:23 -07:00
parent fb37ec16f8
commit 96b545c6b5
7 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dist/css/bootstrap.css vendored
View File

@ -2491,35 +2491,41 @@ fieldset[disabled] .checkbox label {
padding-left: 0; padding-left: 0;
} }
.input-sm, .input-sm,
.form-horizontal .form-group-sm .form-control { .form-group-sm .form-control {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
select.input-sm { select.input-sm,
select.form-group-sm .form-control {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-sm, textarea.input-sm,
select[multiple].input-sm { textarea.form-group-sm .form-control,
select[multiple].input-sm,
select[multiple].form-group-sm .form-control {
height: auto; height: auto;
} }
.input-lg, .input-lg,
.form-horizontal .form-group-lg .form-control { .form-group-l .form-control {
height: 46px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.33; line-height: 1.33;
border-radius: 6px; border-radius: 6px;
} }
select.input-lg { select.input-lg,
select.form-group-l .form-control {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.input-lg, textarea.input-lg,
select[multiple].input-lg { textarea.form-group-l .form-control,
select[multiple].input-lg,
select[multiple].form-group-l .form-control {
height: auto; height: auto;
} }
.has-feedback { .has-feedback {

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

42
docs/dist/css/bootstrap.css vendored
View File

@ -2491,35 +2491,41 @@ fieldset[disabled] .checkbox label {
padding-left: 0; padding-left: 0;
} }
.input-sm, .input-sm,
.form-horizontal .form-group-sm .form-control { .form-group-sm .form-control {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
select.input-sm { select.input-sm,
select.form-group-sm .form-control {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-sm, textarea.input-sm,
select[multiple].input-sm { textarea.form-group-sm .form-control,
select[multiple].input-sm,
select[multiple].form-group-sm .form-control {
height: auto; height: auto;
} }
.input-lg, .input-lg,
.form-horizontal .form-group-lg .form-control { .form-group-l .form-control {
height: 46px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.33; line-height: 1.33;
border-radius: 6px; border-radius: 6px;
} }
select.input-lg { select.input-lg,
select.form-group-l .form-control {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.input-lg, textarea.input-lg,
select[multiple].input-lg { textarea.form-group-l .form-control,
select[multiple].input-lg,
select[multiple].form-group-l .form-control {
height: auto; height: auto;
} }
.has-feedback { .has-feedback {
@ -2530,7 +2536,7 @@ select[multiple].input-lg {
} }
.form-control-feedback { .form-control-feedback {
position: absolute; position: absolute;
top: 25px; top: 0;
right: 0; right: 0;
z-index: 2; z-index: 2;
display: block; display: block;
@ -2554,7 +2560,11 @@ select[multiple].input-lg {
.has-success .radio, .has-success .radio,
.has-success .checkbox, .has-success .checkbox,
.has-success .radio-inline, .has-success .radio-inline,
.has-success .checkbox-inline { .has-success .checkbox-inline,
.has-success.radio label,
.has-success.checkbox label,
.has-success.radio-inline label,
.has-success.checkbox-inline label {
color: #3c763d; color: #3c763d;
} }
.has-success .form-control { .has-success .form-control {
@ -2580,7 +2590,11 @@ select[multiple].input-lg {
.has-warning .radio, .has-warning .radio,
.has-warning .checkbox, .has-warning .checkbox,
.has-warning .radio-inline, .has-warning .radio-inline,
.has-warning .checkbox-inline { .has-warning .checkbox-inline,
.has-warning.radio label,
.has-warning.checkbox label,
.has-warning.radio-inline label,
.has-warning.checkbox-inline label {
color: #8a6d3b; color: #8a6d3b;
} }
.has-warning .form-control { .has-warning .form-control {
@ -2606,7 +2620,11 @@ select[multiple].input-lg {
.has-error .radio, .has-error .radio,
.has-error .checkbox, .has-error .checkbox,
.has-error .radio-inline, .has-error .radio-inline,
.has-error .checkbox-inline { .has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label {
color: #a94442; color: #a94442;
} }
.has-error .form-control { .has-error .form-control {
@ -2627,6 +2645,9 @@ select[multiple].input-lg {
.has-error .form-control-feedback { .has-error .form-control-feedback {
color: #a94442; color: #a94442;
} }
.has-feedback label ~ .form-control-feedback {
top: 25px;
}
.has-feedback label.sr-only ~ .form-control-feedback { .has-feedback label.sr-only ~ .form-control-feedback {
top: 0; top: 0;
} }
@ -2707,7 +2728,6 @@ select[multiple].input-lg {
} }
} }
.form-horizontal .has-feedback .form-control-feedback { .form-horizontal .has-feedback .form-control-feedback {
top: 0;
right: 15px; right: 15px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {

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

12
less/forms.less
View File

@ -306,11 +306,13 @@ input[type="checkbox"] {
// Build on `.form-control` with modifier classes to decrease or increase the // Build on `.form-control` with modifier classes to decrease or increase the
// height and font-size of form controls. // height and font-size of form controls.
.input-sm { .input-sm,
.form-group-sm .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
} }
.input-lg { .input-lg,
.form-group-l .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
} }
@ -523,9 +525,6 @@ input[type="checkbox"] {
padding-top: ((@padding-large-vertical * @line-height-large) + 1); padding-top: ((@padding-large-vertical * @line-height-large) + 1);
} }
} }
.form-control {
&:extend(.input-lg);
}
} }
.form-group-sm { .form-group-sm {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
@ -533,8 +532,5 @@ input[type="checkbox"] {
padding-top: (@padding-small-vertical + 1); padding-top: (@padding-small-vertical + 1);
} }
} }
.form-control {
&:extend(.input-sm);
}
} }
} }