Merge branch 'master' into feature-2.10

This commit is contained in:
afc163 2017-04-13 11:18:49 +08:00
commit 9ef7b23b53

View File

@ -28,13 +28,13 @@ exports[`Search should show cross icon when input value exists 1`] = `
<span <span
className="undefined-action" className="undefined-action"
> >
<Component <Icon
type="search" type="search"
> >
<i <i
className="anticon anticon-search" className="anticon anticon-search"
/> />
</Component> </Icon>
</span> </span>
</div> </div>
</Search> </Search>
@ -70,13 +70,13 @@ exports[`Search should show cross icon when input value exists 2`] = `
href="#" href="#"
onClick={[Function]} onClick={[Function]}
> >
<Component <Icon
type="cross-circle" type="cross-circle"
> >
<i <i
className="anticon anticon-cross-circle" className="anticon anticon-cross-circle"
/> />
</Component> </Icon>
</a> </a>
</div> </div>
</Search> </Search>