Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_aliyun

public/react/src/modules/tpm/NewHeader.js

@@ -351,7 +351,7 @@ class NewHeader extends Component {
 							</div>
 						</div>
 					</Modal>
-					<a href="/" className={" fl ml25 mr25"}>
+					<a href="/" className={" fl ml25 mr60"}>
 						{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
 					</a>
 
@@ -456,7 +456,7 @@ class NewHeader extends Component {
 						</div>
 					</div>
                 <div style={{display:isLogin===true?'block':'none'}}>
-                    <div className="fr edu-menu-panel mr10 mtf20 mr25" style={{height:'60px'}}>
+                    <div className="fr edu-menu-panel mr10 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">

public/stylesheets/educoder/edu-all.css

@@ -6,7 +6,7 @@
     float: left;
     width: 97px;
 }
-.head-nav{float: left;width: 810px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
+.head-nav{float: left;width: 800px;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}