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

Merge pull request 'standalone merge problem' (#214) from caishi/forgeplus-react:standalone into standalone

This commit is contained in:
jasder 2021-10-22 11:44:51 +08:00
parent b16e95923a 848109afe8
commit 987eb39681
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,7 +575,7 @@ 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 ?

7
src/modules/login/EducoderLogin.js
View File

@ -89,14 +89,15 @@ class EducoderLogin extends Component {
render() { render() {
let {showbool,loginstatus,logini} = this.state; let { showbool } = this.state;
const { mygetHelmetapi } = this.props;
return ( return (
<div style={newContainer} className=" clearfix" > <div style={newContainer} className=" clearfix" >
<div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}> <div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}>
<div style={{cursor:"pointer"}}> <div style={{cursor:"pointer"}}>
{ {
settings && settings.login_logo_url ? mygetHelmetapi && mygetHelmetapi.login_logo_url ?
<img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(settings.login_logo_url)}/> <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(mygetHelmetapi.login_logo_url)}/>
: :
<img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/> <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/>
} }