From 656992d2a44996f412051221ba0485eff868dd6a 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 18:27:28 +0800
Subject: [PATCH] b

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

diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index dc54176b9..ee2af14c8 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -15,7 +15,7 @@
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 950px;
+    min-width: 850px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 705ba5324..890aa4990 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={"fl mr30 ml10"}>
+				<a href="/" className={"fl mr30 ml10 ml25"}>
 					<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
 				</a>
 
@@ -781,7 +781,7 @@ submittojoinclass=(value)=>{
 			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
 			    </span>*/}
           { user===undefined?
-            <span className="font-15 fr mt17 ml20">
+            <span className="font-15 fr mt17 ml20 mr25">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
@@ -790,7 +790,7 @@ submittojoinclass=(value)=>{
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
             </span>:
-            <div className="fr edu-menu-panel mr10" style={{height:'60px'}}>
+            <div className="fr edu-menu-panel mr25" style={{height:'60px'}}>
               <a href={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`} className="fl ml15">
                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
                      src={getImageUrl(`images/`+user.image_url)} width="34">
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 2a6e45d68..15fc0bd32 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -15,7 +15,7 @@
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 950px;
+    min-width: 850px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;