Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/public/css/edu-all.css

@@ -1,7 +1,10 @@
 /*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader{background: #24292D !important; width:100%; height: 60px !important; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
-.newHeader .logoimg{margin-top:12px;float: left;width: 36px}
+.newHeader .logoimg{
+    margin-top: 16px;
+    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 li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}

public/react/src/modules/tpm/TPMIndex.css

@@ -18,7 +18,9 @@ body>.-task-title {
 
 /*Header START*/
 .newHeader .logoimg {
-	max-height: 60px;
+    margin-top: 16px;
+    float: left;
+    width: 97px;
 }
 .head-right i {
 	font-size: 20px;

public/stylesheets/educoder/edu-all.css

@@ -1,7 +1,10 @@
 /*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader{background: #24292D !important; width:100%; height: 60px !important; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
-.newHeader .logoimg{margin-top:12px;float: left;width: 36px}
+.newHeader .logoimg{
+    margin-top: 16px;
+    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 li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}