From a48bda6bd6297ec18edc8813b433e679809d45ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 17:25:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/css/edu-all.css       |  2 +-
 public/react/src/modules/tpm/NewHeader.js | 15 ++++++++-------
 public/stylesheets/educoder/edu-all.css   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index 258aa4a4c..da28fb736 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -6,7 +6,7 @@
     float: left;
     width: 97px;}
 .head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
-.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
+.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
 .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
 .head-nav ul#header-nav li a:hover{color: #cccccc;}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index b89d59fe7..133f47037 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -649,20 +649,21 @@ submittojoinclass=(value)=>{
 					{...this.state}
 					{...this.props}
 				/>:""}
-
-				<div className="educontent clearfix">
+				<a href="/" className={"ml20 fl"}>
+					<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
+				</a>
+				<div className="educontent">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
-          <a href="/">
-            <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
-          </a>
+
           <div className="head-nav pr">
 
             <ul id="header-nav">
-              {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+              <li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>
 
               {/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
               <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
-                <a href={this.props.Headertop===undefined?"":'/paths'}>实践课程</a></li>
+                <a href={this.props.Headertop===undefined?"":'/paths'}>实践课程</a>
+              </li>
 
               {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
               <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 9ab0a3948..0b2ebc103 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -6,7 +6,7 @@
     float: left;
     width: 97px;}
 .head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
-.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
+.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
 .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
 .head-nav ul#header-nav li a:hover{color: #cccccc;}

From 18c2446b99cb07cad7ee47d462c593b27f24df12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 18:10:23 +0800
Subject: [PATCH 2/2] b

---
 public/react/src/modules/tpm/NewHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 133f47037..d197bc9c4 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -649,7 +649,7 @@ submittojoinclass=(value)=>{
 					{...this.state}
 					{...this.props}
 				/>:""}
-				<a href="/" className={"ml20 fl"}>
+				<a href="/" className={" fl"}>
 					<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
 				</a>
 				<div className="educontent">