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

app/views/competitions/_header.html.erb

@@ -68,7 +68,7 @@
 
       <div class="nav-border"><p id="nav-white"></p></div>
     </ul>
-    <div class="fr edu-menu-panel ml15" style="height:60px;">
+    <div class="fr edu-menu-panel" style="height:60px;">
       <% if User.current.logged? %>
         <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fr mt15 ml40" %>
         <ul class="edu-menu-list edu-menu-lists" style="top:60px;">

app/views/layouts/_logined_header.html.erb

@@ -50,7 +50,7 @@
       </div>
     </div>
   </div>
-  <div class="fr edu-menu-panel ml15" style="height:60px;">
+  <div class="fr edu-menu-panel" style="height:60px;">
     <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
     <ul class="edu-menu-list" style="top:60px;">
       <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>

app/views/layouts/_unlogin_header.html.erb

@@ -50,7 +50,7 @@
     </div>
   </div>
 
-  <span class="font-15 fr mt15 ml15">
+  <span class="font-15 fr mt15">
       <a href="/login" class="mr5 color-white">登录</a>
     <em class="vertical-line"></em>
     <a href="/register" class="mr5 color-white">注册</a>

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

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

public/stylesheets/educoder/edu-all.css

@@ -1,7 +1,11 @@
 /*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader{background: #24292D;width:100%; height: 60px; 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: 920px;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}