mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 12:51:52 +02:00
Code Issues Releases Wiki Activity

Fix incorrect select height calculation (#21171)

Browse Source
This commit is contained in:
Florian Schlittenbauer
2016-11-28 22:33:11 +01:00
committed by Mark Otto
parent bccbc4f0c3
commit 959c4e527c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_forms.scss
View File

@@ -67,7 +67,7 @@
select.form-control { select.form-control {
&:not([size]):not([multiple]) { &:not([size]):not([multiple]) {
$select-border-width: ($border-width * 2); $select-border-width: ($border-width * 2);
height: calc(#{$input-height} - #{$select-border-width}); height: calc(#{$input-height} + #{$select-border-width});
} }
&:focus::-ms-value { &:focus::-ms-value {

2
scss/_variables.scss
View File

@@ -416,7 +416,7 @@ $input-padding-y-sm: .25rem !default;
$input-padding-x-lg: 1.5rem !default; $input-padding-x-lg: 1.5rem !default;
$input-padding-y-lg: .75rem !default; $input-padding-y-lg: .75rem !default;
$input-height: (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default; $input-height: (($font-size-base * $input-line-height) + ($input-padding-y * 2)) !default;
$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default; $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;