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

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>