mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome
This commit is contained in:
parent
06c00d5591
commit
4ed95f5fa2
12
dist/css/bootstrap.css
vendored
12
dist/css/bootstrap.css
vendored
@ -2716,7 +2716,7 @@ select[multiple].form-group-sm .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.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.input-lg {
|
select.input-lg {
|
||||||
@ -2731,7 +2731,7 @@ select[multiple].input-lg {
|
|||||||
height: 46px;
|
height: 46px;
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 1.33;
|
line-height: 1.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.form-group-lg .form-control {
|
select.form-group-lg .form-control {
|
||||||
@ -2746,7 +2746,7 @@ select[multiple].form-group-lg .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.3333333;
|
||||||
}
|
}
|
||||||
.has-feedback {
|
.has-feedback {
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -2956,7 +2956,7 @@ select[multiple].form-group-lg .form-control {
|
|||||||
}
|
}
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.form-horizontal .form-group-lg .control-label {
|
.form-horizontal .form-group-lg .control-label {
|
||||||
padding-top: 14.3px;
|
padding-top: 14.333333px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
@ -3325,7 +3325,7 @@ fieldset[disabled] .btn-link:focus {
|
|||||||
.btn-group-lg > .btn {
|
.btn-group-lg > .btn {
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 1.33;
|
line-height: 1.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
.btn-sm,
|
.btn-sm,
|
||||||
@ -3723,7 +3723,7 @@ tbody.collapse.in {
|
|||||||
height: 46px;
|
height: 46px;
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 1.33;
|
line-height: 1.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.input-group-lg > .form-control,
|
select.input-group-lg > .form-control,
|
||||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -229,7 +229,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-xs-4">
|
<div class="col-xs-4">
|
||||||
<label for="input-@line-height-large">@line-height-large</label>
|
<label for="input-@line-height-large">@line-height-large</label>
|
||||||
<input id="input-@line-height-large" type="text" value="1.33" data-var="@line-height-large" class="form-control"/>
|
<input id="input-@line-height-large" type="text" value="1.3333333" data-var="@line-height-large" class="form-control"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
<div class="col-xs-4">
|
<div class="col-xs-4">
|
||||||
|
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/raw-files.min.js
vendored
2
docs/assets/js/raw-files.min.js
vendored
File diff suppressed because one or more lines are too long
12
docs/dist/css/bootstrap.css
vendored
12
docs/dist/css/bootstrap.css
vendored
@ -2716,7 +2716,7 @@ select[multiple].form-group-sm .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.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.input-lg {
|
select.input-lg {
|
||||||
@ -2731,7 +2731,7 @@ select[multiple].input-lg {
|
|||||||
height: 46px;
|
height: 46px;
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 1.33;
|
line-height: 1.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.form-group-lg .form-control {
|
select.form-group-lg .form-control {
|
||||||
@ -2746,7 +2746,7 @@ select[multiple].form-group-lg .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.3333333;
|
||||||
}
|
}
|
||||||
.has-feedback {
|
.has-feedback {
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -2956,7 +2956,7 @@ select[multiple].form-group-lg .form-control {
|
|||||||
}
|
}
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.form-horizontal .form-group-lg .control-label {
|
.form-horizontal .form-group-lg .control-label {
|
||||||
padding-top: 14.3px;
|
padding-top: 14.333333px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
@ -3325,7 +3325,7 @@ fieldset[disabled] .btn-link:focus {
|
|||||||
.btn-group-lg > .btn {
|
.btn-group-lg > .btn {
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 1.33;
|
line-height: 1.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
.btn-sm,
|
.btn-sm,
|
||||||
@ -3723,7 +3723,7 @@ tbody.collapse.in {
|
|||||||
height: 46px;
|
height: 46px;
|
||||||
padding: 10px 16px;
|
padding: 10px 16px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 1.33;
|
line-height: 1.3333333;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
select.input-group-lg > .form-control,
|
select.input-group-lg > .form-control,
|
||||||
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -99,7 +99,7 @@
|
|||||||
@padding-xs-vertical: 1px;
|
@padding-xs-vertical: 1px;
|
||||||
@padding-xs-horizontal: 5px;
|
@padding-xs-horizontal: 5px;
|
||||||
|
|
||||||
@line-height-large: 1.33;
|
@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
|
||||||
@line-height-small: 1.5;
|
@line-height-small: 1.5;
|
||||||
|
|
||||||
@border-radius-base: 4px;
|
@border-radius-base: 4px;
|
||||||
|
Loading…
Reference in New Issue
Block a user