Merge branch 'lingbing' into develop
Conflicts: app/views/organizations/_org_custom_header.html.erb
This commit is contained in:
commit
0f17ac0e9e
|
@ -1,11 +1,11 @@
|
|||
|
||||
<div class="por_header_top">
|
||||
<div class="por_header_con" >
|
||||
<%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
|
||||
<%= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
|
||||
<% if User.current.logged? %>
|
||||
<div class="navHomepageProfile" id="navHomepageProfile">
|
||||
<ul>
|
||||
<li class="homepageProfileMenuIcon fr mt15" id="homepageProfileMenuIcon">
|
||||
<li class="homepageProfileMenuIcon fr mt5 " id="homepageProfileMenuIcon">
|
||||
<%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :width =>"40", :height => "40", :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_url_in_org(User.current.id) %>
|
||||
<ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
|
||||
<li><%= link_to "修改资料", my_account_path, :class => "menuGrey"%></li>
|
||||
|
@ -91,10 +91,11 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% if User.current.admin_of_org?(@organization) %>
|
||||
<a href="<%= setting_organization_path(@organization) %>" class="link-black fr por_edit_index" target="_blank">配置</a>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<div class="cl"></div>
|
||||
</div><!--por_nav end-->
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
</h2>
|
||||
<ul class="por_hotbar_left fl">
|
||||
<% if acts.count > 1 %>
|
||||
<% acts[1..2].each do |activity| %>
|
||||
<% acts[1..3].each do |activity| %>
|
||||
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
|
||||
<% document = activity.org_act %>
|
||||
<li>
|
||||
<%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
|
||||
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
|
||||
<%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
|
@ -25,7 +25,7 @@
|
|||
<% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
|
||||
<% if message.board.org_subfield_id %>
|
||||
<li>
|
||||
<%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
|
||||
<%= link_to document.title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
|
||||
<%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
|
@ -33,7 +33,7 @@
|
|||
</li>
|
||||
<% else %>
|
||||
<li>
|
||||
<%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{title}".html_safe, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
|
||||
<%= link_to document.title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
|
||||
<%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
|
@ -44,7 +44,7 @@
|
|||
<% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
|
||||
<% news = activity.org_act %>
|
||||
<li>
|
||||
<%= link_to "<span class='por_icons_hot fl'>热门推荐</span>#{news.title}".html_safe, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
|
||||
<%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
|
||||
<%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
|
@ -54,54 +54,6 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% if acts.count > 3 %>
|
||||
<% activity = acts[3] %>
|
||||
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
|
||||
<% document = activity.org_act %>
|
||||
<li>
|
||||
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hot_title link-black', :target => "_blank", :title => document.title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span>
|
||||
<%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
|
||||
</li>
|
||||
<% else activity.container_type == 'OrgSubfield' %>
|
||||
<% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
|
||||
<% message = activity.org_act %>
|
||||
<% content = message.parent_id.nil? ? message.content : message.parent.content %>
|
||||
<% title = message.parent_id.nil? ? message.subject : message.parent.subject %>
|
||||
<% if message.board.org_subfield_id %>
|
||||
<li>
|
||||
<%= link_to title, board_message_url_in_org(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
|
||||
<%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
|
||||
</li>
|
||||
<% else %>
|
||||
<li>
|
||||
<%= link_to title, board_message_path(message.board.id,message.id), class: 'por_hot_title link-black', :target => "_blank", :title => title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span>
|
||||
<%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
|
||||
<% news = activity.org_act %>
|
||||
<li>
|
||||
<%= link_to news.title, news_path(news), class: 'por_hot_title link-black', :target => "_blank", :title => news.title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span>
|
||||
<%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
|
||||
</p>
|
||||
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 60, :maxwordsnum => 80, :maxwidth => 0, :cl => "por_hot_txt"} %>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
|
||||
<%# if acts.count > 3 %>
|
||||
|
@ -114,9 +66,11 @@
|
|||
<% else %>
|
||||
<%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
|
||||
<% end %>
|
||||
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
|
||||
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
|
||||
<div style="background: #f8fafb;">
|
||||
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
|
||||
<p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
|
||||
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
|
||||
</div>
|
||||
</div>
|
||||
<% else activity.container_type == 'OrgSubfield' %>
|
||||
<!--发送过来的帖子-->
|
||||
|
|
|
@ -71,8 +71,8 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% unless acts[1..5].nil? %>
|
||||
<% acts[1..5].each do |activity| %>
|
||||
<% unless acts[1..4].nil? %>
|
||||
<% acts[1..4].each do |activity| %>
|
||||
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
|
||||
<% document = activity.org_act %>
|
||||
<ul class="por_post_list">
|
||||
|
@ -110,10 +110,10 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% unless acts[6..19].nil? %>
|
||||
<% unless acts[5..16].nil? %>
|
||||
<div class="fl">
|
||||
<ul class="por_post_right por_post_list">
|
||||
<% acts[6..19].each do |activity| %>
|
||||
<% acts[6..16].each do |activity| %>
|
||||
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
|
||||
<% document = activity.org_act %>
|
||||
<li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
|
||||
|
|
|
@ -33,9 +33,6 @@
|
|||
<li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
|
||||
<a href="javascript:void(0);" class="por_teachers_type">名师风采</a>
|
||||
</li>
|
||||
<li id="por_teachers_nav_2" onclick="HoverLi(2);">
|
||||
<a href="javascript:void(0);" class="por_teachers_type">学生英雄榜</a>
|
||||
</li>
|
||||
<!--<a href="javascript:void(0);" target="_blank" class="f12 fontGrey2 fr mt5">更多></a>-->
|
||||
<div class="cl"></div>
|
||||
</ul>
|
||||
|
@ -65,29 +62,6 @@
|
|||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="por_teachers_content_2" class="undis">
|
||||
<ul class="por_teachers_li">
|
||||
<% excellent_students.each do |student| %>
|
||||
<li >
|
||||
<%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
|
||||
<div class="por_teachers_txt fl mt5">
|
||||
<%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name link-black fl", :target => '_blank' %>
|
||||
<p class="por_teachers_p fr" title="<%= student.my_workplace %>"><%= student.my_workplace %></p>
|
||||
<div class="cl"></div>
|
||||
<p class="por_teachers_span ">
|
||||
<% unless student.my_blogs_count == 0 %>
|
||||
<span class=" mr10">博客 <%= student.my_blogs_count %></span>
|
||||
<% end %>
|
||||
<% unless student.courses.count == 0 %>
|
||||
<span class="mr10">课程 <%= student.courses.count %></span>
|
||||
<% end %>
|
||||
</p>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
|
|
@ -197,7 +197,7 @@ a.sn-reply-username { color:#24366e; margin-right:15px; }
|
|||
.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;}
|
||||
.topnav_login_list a{color:#269ac9;}
|
||||
.topnav_login_list li{ }
|
||||
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
|
||||
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:50px; position:relative; display:inline-block; line-height:0;}
|
||||
.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
|
||||
.none {display: none;}
|
||||
.user-img,.user-img img{ margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;}
|
||||
|
|
|
@ -1,64 +1,64 @@
|
|||
/* 门户首页 */
|
||||
#por_header{ width:100%; }
|
||||
.por_header_top{ width:100%; height:70px; background:#3b94d6; }
|
||||
.por_header_con{ width:1000px; margin:0 auto; height:70px; }
|
||||
.por_logo{ margin-top:5px;}
|
||||
.por_header_top{ width:100%; height:55px; background:#3b94d6; }
|
||||
.por_header_con{ width:1000px; margin:0 auto; height:55px; }
|
||||
.por_logo img{ margin-top:2px; height:51px;}
|
||||
.por_login li{ float:left;}
|
||||
.por_login li a{ display:block; padding:0 15px; height:70px; line-height:70px;font-size:16px; color:#fff; }
|
||||
.por_login li a{ display:block; padding:0 15px; height:55px; line-height:55px;font-size:16px; color:#fff; }
|
||||
.por_login li a:hover{ background-color:#1173bc;}
|
||||
.por_search{ margin-top:15px; margin-right:20px;}
|
||||
.por_search{ margin-top:10px; margin-right:20px;}
|
||||
.pro_input_search{ background-color:#daeefc; height:36px; width:355px; border:none; padding:0 5px; color:#3b94d6;}
|
||||
a.por_search_btn{ display:block;background:#daeefc url(../images/org_custom/icons_por.png) 0 8px no-repeat; width:25px; height:36px;}
|
||||
a:hover.por_search_btn{background:#daeefc url(../images/org_custom/icons_por.png) -35px 8px no-repeat; }
|
||||
.por_nav{ width:1000px; height:70px; overflow:hidden; margin: 0 auto; position:relative; }
|
||||
a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:20px;}
|
||||
.por_nav ul{ border-bottom:7px solid #ccc; height:63px;}
|
||||
a.por_search_btn{ display:block;background:#daeefc url(../images/icons_por.png) 0 8px no-repeat; width:25px; height:36px;}
|
||||
a:hover.por_search_btn{background:#daeefc url(../images/icons_por.png) -35px 8px no-repeat; }
|
||||
.por_nav{ width:100%; height:50px; background-color:#eeefef; }
|
||||
.por_nav ul{ width:1000px;height:50px; overflow:hidden; margin: 0 auto; position:relative;}
|
||||
a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:15px;}
|
||||
.por_nav ul li{ float:left; }
|
||||
.por_nav ul li a{ display: block; height:63px; padding:0 20px; line-height:63px; font-size:18px; color:#333; }
|
||||
.por_nav ul li a:hover{ border-bottom:7px solid #3b94d6; }
|
||||
.por_index_act{border-bottom:7px solid #3b94d6; }
|
||||
.por_nav ul li a{ display: block; height:63px; padding:0 20px; line-height:50px; font-size:16px; color:#333; }
|
||||
.por_nav ul li a:hover{ color:#3b94d6; }
|
||||
.por_nav ul li a.por_index_act{color:#3b94d6; }
|
||||
|
||||
#por_container{ width:1000px; margin:10px auto;}
|
||||
.por_left{ width:685px; margin-right:15px; float:left; }
|
||||
.por_right{ width:300px; float:left;}
|
||||
.por_icons_hot{ background:url(../images/org_custom/icons_por.png) 0 -78px no-repeat; height:22px; width:55px; padding-left:3px; color:#fff; font-size:12px; line-height:22px; font-weight:normal;}
|
||||
.por_h2_index{ font-size:20px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
|
||||
.por_h2_index{ font-size:18px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
|
||||
a.por_more_index{ font-size:12px; color:#999; }
|
||||
.por_hotbar_left li{ width:365px; padding:12px 5px 12px 0; border-bottom:1px dashed #e8e5e5;}
|
||||
a.por_hot_title{ font-size:16px; display:block; font-weight:bold; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_hot_txt{ color:#666; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
|
||||
.por_time{ color:#999;}
|
||||
a.por_hot_name{color:#3b94d6;}
|
||||
.por_hotbar_right{ border:1px solid #e8e5e5; padding:5px; margin-top:15px; width:300px;}
|
||||
.por_hotbar_right{ padding:5px 0 5px 10px; margin-top:15px; width:300px; }
|
||||
.por_hotbar_right img{ width:300px; height:246px;}
|
||||
.por_hot_title_r{ font-size:16px; display:block; font-weight:bold; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_hot_txt_r{color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
|
||||
.por_course{ }
|
||||
.por_course_bar{ width:328px; margin:0 7px; padding:20px 0; border-bottom:1px solid #e8e5e5;}
|
||||
.por_course_bar{ width:328px; margin:0 7px; padding:20px 0 0px;}
|
||||
a.por_course_title{font-size:14px; margin-bottom:10px; display:block; font-weight:bold; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_course_bar img{ width:140px; height:100px; }
|
||||
.por_course_txt { width:180px; margin-left:5px;color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
|
||||
.por_course_time{color:#3b94d6; margin-left:5px;}
|
||||
.por_post{ border-bottom:1px solid #e8e5e5; padding-bottom:5px;}
|
||||
.por_post{ padding-bottom:5px;}
|
||||
.por_post_left{ width:394px; margin-top:15px;}
|
||||
.por_post_leftbar img{ width:377px; height:163px;}
|
||||
.por_post_leftbar { border-bottom:1px dashed #e8e5e5; padding-bottom:5px; margin-bottom:10px;}
|
||||
a.por_post_title{font-size:18px; display:block; width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_post_txt{color:#666; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; }
|
||||
.post_icons_grey{ width:5px; height:5px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
|
||||
.por_post_list li{ height:20px; height:30px;}
|
||||
.post_icons_grey{ width:4px; height:4px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
|
||||
.por_post_list li{ height:35px;}
|
||||
.por_post_list li a{ font-size:14px; }
|
||||
a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_post_right{ width:280px; border-left:1px solid #e8e5e5; margin-top:15px; padding-left:10px;}
|
||||
.por_news_list li{ padding:15px 0; border-bottom:1px dashed #e8e5e5;}
|
||||
.por_users_img{ width:40px; height:40px; border:1px solid #e8e5e5;}
|
||||
.por_users_img{ width:40px; height:40px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
|
||||
.por_news_txt{ width:245px; margin-left:10px;}
|
||||
.por_news_p{ line-height:20px;max-height:40px;min-width:240px;overflow:hidden;text-overflow:ellipsis; }
|
||||
a.por_zan{ background:url(../images/org_custom/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
|
||||
a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
|
||||
.por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_projects{border-bottom:1px solid #e8e5e5; padding-bottom:10px; margin-top:10px;}
|
||||
.por_projects{ padding-bottom:10px; margin-top:10px;}
|
||||
.por_projects ul li{ padding:5px 0;}
|
||||
.por_projects ul{ margin-top:5px;}
|
||||
.por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#666; }
|
||||
|
@ -67,8 +67,8 @@ a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px n
|
|||
.por_teachers{ margin-top:20px; }
|
||||
#por_teachers_nav {border-bottom:1px solid #d0d0d0; height:31px;}
|
||||
#por_teachers_nav li {float:left; padding:0px 5px; text-align:center; }
|
||||
#por_teachers_nav li a{font-size:20px;}
|
||||
.por_teachers_hover {border:1px solid #d0d0d0; border-bottom:1px solid #fff; }
|
||||
#por_teachers_nav li a{font-size:18px;}
|
||||
.por_teachers_hover { }
|
||||
.por_teachers_hover a{color:#3b94d6;}
|
||||
.por_teachers_nomal {border-bottom:none; }
|
||||
.por_teachers_nomal a{color:#999;}
|
||||
|
@ -76,7 +76,7 @@ a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px n
|
|||
.dis {display:block;}
|
||||
a.por_more_teacher{ font-size:12px; }
|
||||
.por_teachers_li{ margin-top:10px;}
|
||||
.por_teachers_li li{ padding:10px 0;border-bottom:1px solid #e8e5e5;}
|
||||
.por_teachers_li li{ padding:10px 0;}
|
||||
.por_teachers_img{ width:60px; height:60px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
|
||||
a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
.por_teachers_p{ font-size:14px; color:#999; width:150px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
|
||||
|
@ -88,22 +88,4 @@ a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden;
|
|||
.por_footer_con ul li{ float:left; text-align:center;}
|
||||
.por_footer_con ul li a{ font-size:14px;}
|
||||
.por_footer_con ul li a span{ color:#999; margin:0 15px ;}
|
||||
.por_footer_con p{ text-align:center; margin-top:20px; color:#777;}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.por_footer_con p{ text-align:center; margin-top:20px; color:#777;}
|
|
@ -533,7 +533,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
|
|||
.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;}
|
||||
.newsActive {width:16px; height:16px; border-radius:50%; background-color:#ff0000; position:absolute; left:17px; top:5px; text-align:center;font-size:12px; color:#ffffff !important;padding-bottom: 3px;padding-left: 2px;padding-right: 1px;font-weight: bold;}
|
||||
.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
|
||||
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
|
||||
.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:50px; position:relative; display:inline-block;}
|
||||
.homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
|
||||
.navHomepageProfile ul li ul {display:none;}
|
||||
.navHomepageProfile ul li:hover ul {display:block;}
|
||||
|
|
Loading…
Reference in New Issue