From 1d8406422173ebfc3f76eb4e6c500ec283ffd4bb Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 23 Sep 2015 09:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E6=8F=8F=E8=BF=B0=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E8=BF=87=E9=95=BF=E4=B8=8D=E4=BC=9A=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_forums.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 855d9031c..8d2fcd7d9 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -98,7 +98,7 @@
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span"><%= @forum.description%></span>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description%></span>
               <%if @forum.creator.id == User.current.id%>
                   <a href="javascript:void(0);" onclick="edit_desc();">
                   <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->