mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-28 21:19:37 +08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
ycjcl868 2019-12-23 16:39:58 +08:00
parent 194bf3603f
commit 31234f1c75
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site/theme/static/demo.less
View File

@ -248,11 +248,7 @@
font-size: 14px;
line-height: 20px;
text-align: center;
<<<<<<< ours
background: @body-background;
=======
background: @component-background;
>>>>>>> theirs
border-radius: 20px;
cursor: pointer;
transition: all 0.24s;