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

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

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 60c09d1c..4f656269 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -351,7 +351,7 @@ class NewHeader extends Component {
 							</div>
 						</div>
 					</Modal>
-					<a href="/" className={" fl"}>
+					<a href="/" className={" fl ml25"}>
 						{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
 					</a>
           	<div className="educontent">
@@ -445,7 +445,7 @@ class NewHeader extends Component {
 						</div>
 					</div>
                 <div style={{display:isLogin===true?'block':'none'}}>
-                    <div className="fr edu-menu-panel mr10 mtf20" style={{height:'60px'}}>
+                    <div className="fr edu-menu-panel mr10 mtf20 mr25" style={{height:'60px'}}>
                             <a href={`/users/${current_user.login}`} className="fl">
                                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" nhname="avatar_image"
                                         src={`/images/${current_user.image_url}`} width="34">
@@ -477,8 +477,8 @@ class NewHeader extends Component {
 							`
 						}
 					</style>
-                <div style={{display:isLogin===false?'block':'none'}} >
-                    <span className="font-15 fr" className={"mtf4"}>
+                <div style={{display:isLogin===false?'block':'none'}} className={"fr mtf4 mr25"} >
+                    <span className="font-15 fr" >
                         <a href="/login" className="mr5 color-white">登录</a>
                         <em className="vertical-line"></em>
                         <a href="/user_join" className="mr5 color-white">注册</a>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 52d682d9..2a185e56 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: 915px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
+.head-nav{float: left;width: 890px;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;}
 .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}