diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb index 07e21c52c..aa286b540 100644 --- a/app/views/news/_course_news.html.erb +++ b/app/views/news/_course_news.html.erb @@ -51,7 +51,7 @@ <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %> <%= l(:label_release_news) %>:<%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
-
<%= textilizable(news, :description) %>
<%= l(:label_create_time) %> :<%= format_time(news.created_on) %>
+

<%= news.description %>
<%= l(:label_create_time) %> :<%= format_time(news.created_on) %>

@@ -92,7 +92,7 @@ }); $(function(){ $('.news_description').each(function () { - if($(this).height() >= 60) + if($(this).height() >= 38) { $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block"); } diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 812b00866..fae52a850 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -19,7 +19,7 @@ a:hover.project_name{ color:#016f33;} a.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} a:hover.project_txt{ color:#066e9a;} .noline{ border-bottom:none;} -.news_description{max-height: 60px;overflow:hidden; } +.news_description{max-height: 38px;overflow:hidden; } .news_description_none{max-height: none;} a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;} a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} @@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;} .problem_p span{ color:#ff3e00;} a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;} a:hover.problem_pic{border:1px solid #64bdd9;} -.problem_txt{ width:610px; margin-left:10px; color:#777777;} +.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;} a.problem_name{ color:#ff5722;} a:hover.problem_name{ color:#d33503;} a.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}