Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/views/layouts/_logined_header.html.erb

@@ -1,4 +1,4 @@
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl ml25 mr60"), home_path %>
 <div class="educontent">
 
   <div class="head-nav pr">
@@ -33,8 +33,11 @@
         </li>
       <% end %>
     </ul>
-    <div class="posi-search mrf40" id="posi-search" style="
-    display: none">
+
+  </div>
+</div>
+<div class="posi-search" id="posi-search" style="
+display: none; right:110px;">
   <div class="search-all clearfix">
     <div class="fl pr search-clear edu-menu-panel" style="display: none">
       <input type="hidden" id="search_type" value="1">
@@ -52,10 +55,7 @@
     </a>
   </div>
 </div>
-  </div>
-</div>
-
-<div class="fr edu-menu-panel" style="height:60px;">
+<div class="fr edu-menu-panel mr25" 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

@@ -1,5 +1,5 @@
 
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl ml25 mr60 "), home_path %>
 
 <div class="educontent">
 
@@ -31,7 +31,10 @@
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>
-    <div class="posi-search unlogin mrf40" id="posi-search" style="display: none" >
+
+  </div>
+</div>
+<div class="posi-search" id="posi-search" style="display: none; right:113px" >
   <div class="search-all clearfix">
     <!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>-->
     <div class="fl pr search-clear edu-menu-panel" style="display: none">
@@ -51,11 +54,8 @@
     </a>
   </div>
 </div>
-  </div>
-</div>
-
 <div>
-  <span class="font-15 fr mt15">
+  <span class="font-15 fr mt15 mr25">
       <a href="/login" class="mr5 color-white">登录</a>
     <em class="vertical-line"></em>
     <a href="/register" class="mr5 color-white">注册</a>