From 36a9f16634e9f506d14992f1480c0129d5e6613f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 9 Oct 2020 09:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/edu-purge.css     |  6 +++---
 src/modules/tpm/NewHeader.js | 12 ++++++------
 src/modules/tpm/TPMIndex.css |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 30212af1..5279a0c4 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -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; */
 }
 
 
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 1f49945a..734496d3 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -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>
             :
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index cf3b7ffe..4ed1bce5 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -25,7 +25,6 @@ body>.-task-title {
 }
 .newHeaders{
   max-width: unset;
-  background: #2B2A2A !important;
   width: 100%;
   height:70px;
   min-width: 1200px;