From b8a40862ce92ba9d0fd2953eedfe435549873130 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 4 Aug 2016 14:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98=E8=A1=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=8C=E4=B8=8D=E6=8A=98=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_pull_request_changes.html.erb | 6 +++---
 public/stylesheets/css/public.css                      | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/pull_requests/_pull_request_changes.html.erb b/app/views/pull_requests/_pull_request_changes.html.erb
index b24efee6a..f8c423504 100644
--- a/app/views/pull_requests/_pull_request_changes.html.erb
+++ b/app/views/pull_requests/_pull_request_changes.html.erb
@@ -16,11 +16,11 @@
                     <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
                   </th>
                   <% if line[0,1] == "-" %>
-                      <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+                      <td class="line-code diff_out"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
                   <% elsif line[0,1] == "+" %>
-                      <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+                      <td class="line-code diff_in"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
                   <% else%>
-                      <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+                      <td class="line-code"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
                   <% end %>
                 </tr>
                 <% line_num += 1 %>
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index cc27955d5..6712d5ef0 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -148,7 +148,6 @@ a.opnionButton:hover{background: #297fb8; }
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
 .font_bold{font-weight: bold;}
 
 
@@ -443,7 +442,7 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no
 .postDetailWrap {width:655px; float:left;}
 .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
-.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+/*.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}*/
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}