Merge pull request 'fix issue' (#109) from caishi/forgeplus-react:feature_repo_second_page into feature_repo_second_page

This commit is contained in:
jasder 2021-09-30 21:25:21 +08:00
commit a400046c91
2 changed files with 6 additions and 3 deletions

View File

@ -64,9 +64,12 @@ function Index(props) {
<Link to={`/${owner}/${projectsId}/tree/${turnbar(i.name)}`} className="task-hide">{i.name}</Link> <Link to={`/${owner}/${projectsId}/tree/${turnbar(i.name)}`} className="task-hide">{i.name}</Link>
<div> <div>
{ {
<Link to={`/${last_commit && last_commit.committer && last_commit.committer.login}`}> last_commit && last_commit.committer && last_commit.committer.id?
<img style={{borderRadius:"50%"}} src={getImageUrl(`/${last_commit && last_commit.committer && last_commit.committer.image_url}`)} alt=""/> <Link to={`/${ last_commit.committer.login}`}>
<img style={{borderRadius:"50%"}} src={getImageUrl(`/${ last_commit.committer.image_url}`)} alt=""/>
</Link> </Link>
:
<img style={{borderRadius:"50%"}} src={getImageUrl(`/${ last_commit.committer.image_url}`)} alt=""/>
} }
<span className="mr3 color-grey-3" style={{fontWeight:"500"}}>{last_commit && last_commit.committer && last_commit.committer.name}</span> <span className="mr3 color-grey-3" style={{fontWeight:"500"}}>{last_commit && last_commit.committer && last_commit.committer.name}</span>
<span className="color-grey-3">更新于{last_commit && last_commit.time_from_now}</span> <span className="color-grey-3">更新于{last_commit && last_commit.time_from_now}</span>

View File

@ -94,7 +94,7 @@ class m_editor extends Component {
<div> <div>
<div className=""> <div className="">
<Editor <Editor
// height={this.state.x} height={"400px"}
language={language ? language : "plaintext"} language={language ? language : "plaintext"}
theme={"vs-grey"} theme={"vs-grey"}
placeholder="请输入内容" placeholder="请输入内容"