From 787dbaaffc89fd9b6c128ace4bab61aaeeb017f0 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 5 May 2016 09:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A4=84=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_subfield_rightM.html.erb | 8 ++++----
 public/stylesheets/org2.css                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb
index 8c090f833..a07b724d2 100644
--- a/app/views/organizations/_org_subfield_rightM.html.erb
+++ b/app/views/organizations/_org_subfield_rightM.html.erb
@@ -38,7 +38,7 @@
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% end %>
-                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
                             <div class="cl"></div>
                           </div>
                       <% else %>
@@ -50,7 +50,7 @@
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
                             <% end %>
-                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
                             <div class="cl"></div>
                           </div>
                       <% end %>
@@ -65,7 +65,7 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
                         <% end %>
-                        <p class="fl sn-index-txt"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
+                        <p class="fl sn-index-txt sn-w229"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
                         <div class="cl"></div>
                       </div>
                   <% end %>
@@ -76,7 +76,7 @@
               <h2 class="h2-title "><%= field.name %></h2>
               <div class="sn-index-wx">
                 <img class="fl sn-index-wximg" src="/images/default_blank/right-02.jpg" width="104" height="104" alt=""/>
-                <p class="fl sn-index-txt">暂无内容！</p>
+                <p class="fl sn-index-txt sn-w229">暂无内容！</p>
                 <div class="cl"></div>
               </div>
             </div>
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 9de2bf56f..52dde9ad4 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -157,7 +157,7 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou
 /* index-wx*/
 .sn-index-wxbox{margin-bottom:20px; background:#fff;}
 .sn-index-wximg{ margin:15px; margin-right:5px;}
-.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;}
+.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px; max-height:64px; overflow:hidden;}
 .sn-index-smallbanner img{ display:block; width:369px; height:169px; }
 
 /* 内页新闻列表 */