Fixes #15074: Fix the nesting problem with form control size variants
This commit is contained in:
parent
80d7be1126
commit
7c71b4874b
|
@ -2494,7 +2494,21 @@ fieldset[disabled] .checkbox label {
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
}
|
}
|
||||||
.input-sm,
|
.input-sm {
|
||||||
|
height: 30px;
|
||||||
|
padding: 5px 10px;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
select.input-sm {
|
||||||
|
height: 30px;
|
||||||
|
line-height: 30px;
|
||||||
|
}
|
||||||
|
textarea.input-sm,
|
||||||
|
select[multiple].input-sm {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
.form-group-sm .form-control {
|
.form-group-sm .form-control {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
|
@ -2502,18 +2516,29 @@ fieldset[disabled] .checkbox label {
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
}
|
}
|
||||||
select.input-sm,
|
|
||||||
select.form-group-sm .form-control {
|
select.form-group-sm .form-control {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
textarea.input-sm,
|
|
||||||
textarea.form-group-sm .form-control,
|
textarea.form-group-sm .form-control,
|
||||||
select[multiple].input-sm,
|
|
||||||
select[multiple].form-group-sm .form-control {
|
select[multiple].form-group-sm .form-control {
|
||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
.input-lg,
|
.input-lg {
|
||||||
|
height: 46px;
|
||||||
|
padding: 10px 16px;
|
||||||
|
font-size: 18px;
|
||||||
|
line-height: 1.33;
|
||||||
|
border-radius: 6px;
|
||||||
|
}
|
||||||
|
select.input-lg {
|
||||||
|
height: 46px;
|
||||||
|
line-height: 46px;
|
||||||
|
}
|
||||||
|
textarea.input-lg,
|
||||||
|
select[multiple].input-lg {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
.form-group-lg .form-control {
|
.form-group-lg .form-control {
|
||||||
height: 46px;
|
height: 46px;
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
|
@ -2521,14 +2546,11 @@ select[multiple].form-group-sm .form-control {
|
||||||
line-height: 1.33;
|
line-height: 1.33;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.input-lg,
|
|
||||||
select.form-group-lg .form-control {
|
select.form-group-lg .form-control {
|
||||||
height: 46px;
|
height: 46px;
|
||||||
line-height: 46px;
|
line-height: 46px;
|
||||||
}
|
}
|
||||||
textarea.input-lg,
|
|
||||||
textarea.form-group-lg .form-control,
|
textarea.form-group-lg .form-control,
|
||||||
select[multiple].input-lg,
|
|
||||||
select[multiple].form-group-lg .form-control {
|
select[multiple].form-group-lg .form-control {
|
||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -309,16 +309,27 @@ 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.
|
||||||
|
//
|
||||||
|
// The `.form-group-* form-control` variations are sadly duplicated to avoid the
|
||||||
|
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
|
||||||
|
|
||||||
.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; @input-border-radius-small);
|
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
|
||||||
}
|
}
|
||||||
|
.form-group-sm {
|
||||||
|
.form-control {
|
||||||
|
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.input-lg,
|
.input-lg {
|
||||||
.form-group-lg .form-control {
|
|
||||||
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
|
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
|
||||||
}
|
}
|
||||||
|
.form-group-lg {
|
||||||
|
.form-control {
|
||||||
|
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Form control feedback states
|
// Form control feedback states
|
||||||
|
|
Loading…
Reference in New Issue