Merge branch 'master' into chore-conflict-feature

This commit is contained in:
信鑫-King 2020-11-01 18:04:04 -08:00 committed by GitHub
commit 39c192ab32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View File

@ -94,17 +94,17 @@
}
// >>> Switcher
& &-switcher {
&-switcher {
.antTreeSwitcherIcon();
position: relative;
flex: none;
align-self: stretch;
width: @tree-title-height;
margin: 0;
line-height: @tree-title-height;
text-align: center;
cursor: pointer;
user-select: none;
&-noop {
cursor: default;
@ -241,6 +241,10 @@
.@{custom-tree-prefix-cls}-switcher {
z-index: 1;
background: @component-background;
&-line-icon {
vertical-align: -.225em;
}
}
}
}

View File

@ -19,7 +19,7 @@
}
// >>> Switcher
& &-switcher {
&-switcher {
&_close {
.@{tree-prefix-cls}-switcher-icon {
svg {

View File

@ -39,7 +39,8 @@ const LIST_CN: Recommend[] = [
const LIST_EN: Recommend[] = [
{
title: 'New generation of Ant Design, the future is coming, let us create it together!',
description: 'Welcome to join usAnt Designers',
description:
'Welcome to join us, Ant Designers!',
img: 'https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*yGcPRroihLQAAAAAAAAAAAAAARQnAQ',
href: 'https://zhuanlan.zhihu.com/p/269789439',
popularize: true,