continue fix for #3481, also fix multiple select large and small size style

This commit is contained in:
afc163 2016-10-19 20:32:14 +08:00
parent 8afe3965c1
commit 0b29ee6fee

View File

@ -140,31 +140,30 @@
height: 28px; height: 28px;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
}
.@{select-prefix-cls}-selection__rendered { &-selection__rendered {
height: 26px; height: 26px;
display: block; display: block;
margin-left: 8px; margin-left: 8px;
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
line-height: 26px; line-height: 26px;
// https://github.com/ant-design/ant-design/issues/3481#issuecomment-254721026 // https://github.com/ant-design/ant-design/issues/3481#issuecomment-254721026
&:after { &:after {
content: '.'; content: '.';
visibility: hidden; visibility: hidden;
pointer-events: none; pointer-events: none;
}
} }
} }
&-lg { &-lg {
.@{select-prefix-cls}-selection--single { .@{select-prefix-cls}-selection--single {
height: 32px; height: 32px;
.@{select-prefix-cls}-selection__rendered {
line-height: 30px;
}
} }
.@{select-prefix-cls}-selection__rendered {
line-height: 30px;
}
.@{select-prefix-cls}-selection--multiple { .@{select-prefix-cls}-selection--multiple {
min-height: 32px; min-height: 32px;
.@{select-prefix-cls}-selection__rendered { .@{select-prefix-cls}-selection__rendered {
@ -182,9 +181,9 @@
} }
.@{select-prefix-cls}-selection--single { .@{select-prefix-cls}-selection--single {
height: 22px; height: 22px;
.@{select-prefix-cls}-selection__rendered { }
line-height: 20px; .@{select-prefix-cls}-selection__rendered {
} line-height: 20px;
} }
.@{select-prefix-cls}-selection--multiple { .@{select-prefix-cls}-selection--multiple {
min-height: 22px; min-height: 22px;
@ -266,6 +265,8 @@
&-selection--multiple { &-selection--multiple {
min-height: 28px; min-height: 28px;
cursor: text; cursor: text;
padding-bottom: 3px;
.clearfix;
.@{select-prefix-cls}-search--inline { .@{select-prefix-cls}-search--inline {
width: auto; width: auto;
@ -276,15 +277,14 @@
} }
.@{select-prefix-cls}-selection__rendered { .@{select-prefix-cls}-selection__rendered {
overflow: hidden; margin-left: 5px;
text-overflow: ellipsis; margin-bottom: -3px;
padding-left: 6px; height: auto;
padding-bottom: 4px;
} }
> ul > li, > ul > li,
.@{select-prefix-cls}-selection__rendered > ul > li { // for tree-select .@{select-prefix-cls}-selection__rendered > ul > li { // for tree-select
margin-top: 4px; margin-top: 3px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
} }