Merge branch 'newVersion_forge' into dev_devOps

This commit is contained in:
caishi 2020-09-16 17:48:12 +08:00
commit 10d4ad7221
1 changed files with 4 additions and 3 deletions

View File

@ -767,7 +767,7 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login ?
<div className="edu-menu-panel">
<i className="iconfont icon-tianjiafangda color-white"></i>
<div className="edu-menu-list" style={{ top: '46px' }}>
<div className="edu-menu-list" style={{ top: '60px' }}>
<div className="overPart"></div>
{/* <ul className={coursestypes === true && this.props.user && this.props.user.main_site === false ? "fl headwith100b edu-txt-center pr ul-leftline" : "fl with50 edu-txt-center pr ul-leftline"}>
{
@ -852,8 +852,9 @@ class NewHeader extends Component {
src={getImageUrl(`images/` + user.image_url)} width="34">
</img>
</a>
<ul className="edu-menu-list" style={{ top: '46px', textAlign: 'center' }}>
<li className="bor-bottom-greyE">
<ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
<li className="bor-bottom-greyE" style={{cursor:"default",background:"#fff"}}>{this.props.current_user.username}</li>
<li>
<Link to={`/users/${this.props.current_user.login}`}>个人中心</Link>
</li>
{