wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gaoyuanwei 2022-07-19 09:43:58 +08:00
parent f1de4b860e caf80caeff
commit a99f4fcbf3
1 changed files with 165 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/views/newHome/components/PopularAbility.vue
View File

@ -307,6 +307,10 @@
color: #212121; color: #212121;
line-height: 0.24rem; line-height: 0.24rem;
height: 1rem; height: 1rem;
<<<<<<< HEAD
=======
word-break: break-all;
>>>>>>> caf80caeffc467a237900c464204e8f426e3e6e6
overflow: hidden; overflow: hidden;
} }
} }