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

Fixes #15074: Manually handle input sizing in form groups instead of using mixins because nesting

This commit is contained in:
Mark Otto 2015-03-25 21:18:19 -07:00
parent b6508f5d04
commit df8010b815
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/css/bootstrap.css
View File

@ -2718,12 +2718,12 @@ select[multiple].input-sm {
line-height: 1.5; line-height: 1.5;
border-radius: 3px; border-radius: 3px;
} }
select.form-group-sm .form-control { .form-group-sm select.form-control {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.form-group-sm .form-control, .form-group-sm textarea.form-control,
select[multiple].form-group-sm .form-control { .form-group-sm select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static { .form-group-sm .form-control-static {
@ -2755,12 +2755,12 @@ select[multiple].input-lg {
line-height: 1.3333333; line-height: 1.3333333;
border-radius: 6px; border-radius: 6px;
} }
select.form-group-lg .form-control { .form-group-lg select.form-control {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.form-group-lg .form-control, .form-group-lg textarea.form-control,
select[multiple].form-group-lg .form-control { .form-group-lg select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static { .form-group-lg .form-control-static {

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

28
less/forms.less
View File

@ -322,7 +322,19 @@ input[type="checkbox"] {
} }
.form-group-sm { .form-group-sm {
.form-control { .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
line-height: @line-height-small;
border-radius: @input-border-radius-small;
}
select.form-control {
height: @input-height-small;
line-height: @input-height-small;
}
textarea.form-control,
select[multiple].form-control {
height: auto;
} }
.form-control-static { .form-control-static {
height: @input-height-small; height: @input-height-small;
@ -338,7 +350,19 @@ input[type="checkbox"] {
} }
.form-group-lg { .form-group-lg {
.form-control { .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
line-height: @line-height-large;
border-radius: @input-border-radius-large;
}
select.form-control {
height: @input-height-large;
line-height: @input-height-large;
}
textarea.form-control,
select[multiple].form-control {
height: auto;
} }
.form-control-static { .form-control-static {
height: @input-height-large; height: @input-height-large;