Skip to content

B
bootstrap
Commit f025840e authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #16159 from twbs/input_sizing 

Fixes #15074
parents 6a6ac5db 57c8e3cd
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 9 deletions
dist/css/bootstrap.css
View file @ f025840e
...@@ -2728,12 +2728,12 @@ select[multiple].input-sm { ...@@ -2728,12 +2728,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 {
...@@ -2765,12 +2765,12 @@ select[multiple].input-lg { ...@@ -2765,12 +2765,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 {
......
dist/css/bootstrap.css.map
View file @ f025840e
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ f025840e
This source diff could not be displayed because it is too large. You can view the blob instead.
less/forms.less
View file @ f025840e
...@@ -322,7 +322,19 @@ input[type="checkbox"] { ...@@ -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"] { ...@@ -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;
......
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