kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies

This commit is contained in:
Mark Otto 2013-11-29 21:59:28 -08:00
parent 61c641ea05
commit 36b82c37ec
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/css/bootstrap.css vendored
View File

@ -2070,7 +2070,7 @@ textarea.input-sm {
} }
.input-lg { .input-lg {
height: 45px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.33; line-height: 1.33;
@ -2078,8 +2078,8 @@ textarea.input-sm {
} }
select.input-lg { select.input-lg {
height: 45px; height: 46px;
line-height: 45px; line-height: 46px;
} }
textarea.input-lg { textarea.input-lg {
@ -3884,7 +3884,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
height: 45px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
line-height: 1.33; line-height: 1.33;
@ -3894,8 +3894,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control, select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn { select.input-group-lg > .input-group-btn > .btn {
height: 45px; height: 46px;
line-height: 45px; line-height: 46px;
} }
textarea.input-group-lg > .form-control, textarea.input-group-lg > .form-control,

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/variables.less
View File

@ -157,7 +157,7 @@
@input-color-placeholder: @gray-light; @input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); @input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@legend-color: @gray-dark; @legend-color: @gray-dark;