Zgna
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'FIX 合并主干开发分支功能' (#220) from develop into master

This commit is contained in:
jasder 2021-10-22 16:55:27 +08:00
parent d81b40969a 6be0d12e8c
commit 3bf9de2d4c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/css/iconfont.css
View File

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

6
src/forge/Main/Detail.js
View File

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