Merge pull request '冲突引起iconfont丢失' (#215) from caishi/forgeplus-react:standalone into standalone

This commit is contained in:
jasder 2021-10-22 14:05:27 +08:00
commit 7407545d1f
6 changed files with 6 additions and 6 deletions

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 2340181 */
src: url('iconfont.woff2?t=1632964996877') format('woff2'),
url('iconfont.woff?t=1632964996877') format('woff'),
url('iconfont.ttf?t=1632964996877') format('truetype');
src: url('iconfont.woff2?t=1634881729644') format('woff2'),
url('iconfont.woff?t=1634881729644') format('woff'),
url('iconfont.ttf?t=1634881729644') format('truetype');
}
.iconfont {

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -576,7 +576,7 @@ class Detail extends Component {
}
</div>
</AlignTop>
<div className="mt6" style={{minHeight:"20px"}}>
{/* <div className="mt6" style={{minHeight:"20px"}}>
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
@ -587,7 +587,7 @@ class Detail extends Component {
<span className="color-grey-9">镜像自 <a className="color-blue hoverLine" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
:""
}
</div>
</div> */}
{
firstSync ? "" :
<DetailBanner