Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

app/views/organizations/_org_subfield_rightM2.html.erb

@@ -4,7 +4,7 @@
   </h2>
   <% excellent_teachers.each do |teacher| %>
       <div class="sn-teacher-list">
-        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sn-fl", :style => "display:block;"), user_path(teacher), :alt => "用户头像", :target => '_blank'  %>
+        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sn-fl sn-avatar-circle", :style => "display:block;"), user_path(teacher), :alt => "用户头像", :target => '_blank'  %>
         <!--<a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>-->
         <div class="sn-teacher-info">
           <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "sn-teacher-name sn-hidden", :title => '', :target => '_blank' %></a>

public/stylesheets/org2.css

@@ -241,8 +241,8 @@ ul.sn-inner-pages li a:hover{ background-color:#24366e; color:#fff; text-decorat
 
 /*名师榜*/
 .sn-teacher-list {margin:0 20px; padding:15px 0; border-bottom:1px solid #e9e9e9;}
-a.sn-teacher-name {width:75px; font-size:18px; color:#777; float:left;}
-.sn-teacher-unit {width:154px; font-size:14px; color:#999; float:left; margin-left:15px; margin-top:3px;}
+a.sn-teacher-name {width:60px; font-size:18px; color:#777; float:left;}
+.sn-teacher-unit {width:169px; font-size:14px; color:#999; float:left; margin-left:15px; margin-top:3px;}
 .sn-teacher-info {height:30px; line-height:30px; vertical-align:middle; float:left; margin-left:15px;}
 .sn-teacher-social {height:30px; line-height:30px; vertical-align:middle; float:left; color:#999; font-size:12px; margin-left:15px;}
 .sn-border-none {border:none;}
@@ -250,6 +250,7 @@ a.sn-teacher-name {width:75px; font-size:18px; color:#777; float:left;}
 .sn-teacher-avatar2 {margin:0 18px; padding:18px 0;}
 .sn-teacher-info2 {color:#666; text-align:center; font-size:16px;}
 .sn-info2-hidden {width:153px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; margin:0 auto;}
+.sn-avatar-circle {border-radius:50%;}
 
 /*弹框*/
 .upload_con h2 {