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

Merge branch 'newVersion_forge' into dev_devOps

This commit is contained in:
caishi 2020-10-09 09:25:08 +08:00
parent 69a9137c34 36a9f16634
commit 229b5a704e
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/css/edu-purge.css
View File

@ -3975,11 +3975,11 @@ html>body #ajax-indicator {
display: block;
height: 100%;
width: 100%;
color: #fff;
color: #333;
font-size: 16px;
}
.head-nav ul#header-nav li a:hover {
.head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a {
color: #5091FF;
}
@ -3988,7 +3988,7 @@ html>body #ajax-indicator {
}
.head-nav ul#header-nav li.active{
background-color: #3B3B3B;
/* background-color: #3B3B3B; */
}

12
src/modules/tpm/NewHeader.js
View File

@ -767,7 +767,7 @@ class NewHeader extends Component {
<div className="head-right">
{this.props.user && this.props.user.login ?
<div className="edu-menu-panel">
<i className="iconfont icon-tianjiafangda color-white"></i>
<i className="iconfont icon-tianjiafangda color-grey-6"></i>
<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"}>
@ -795,7 +795,7 @@ class NewHeader extends Component {
<div className="ml30 edu-menu-panel">
{user && user.login &&
<a href={`${mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.tiding_url}`} style={{ position: 'relative' }} target="_blank">
<i className="iconfont icon-xiaoxilingdang color-white"></i>
<i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
<span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
</span>
</a>
@ -832,18 +832,18 @@ class NewHeader extends Component {
</div>
{user === undefined ?
<span className="font-15">
<a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
<a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
<span><em className="vertical-line"></em><a className="ml5 color-white" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
<span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
}
</span>
: user.login === "" ?
<span className="font-15">
<a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
<a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
<span><em className="vertical-line"></em><a className="color-white ml5" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
<span><em className="vertical-line"></em><a className="color-grey-6 ml5" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
}
</span>
:

1
src/modules/tpm/TPMIndex.css
View File

@ -25,7 +25,6 @@ body>.-task-title {
}
.newHeaders{
max-width: unset;
background: #2B2A2A !important;
width: 100%;
height:70px;
min-width: 1200px;