From 6fe4f200f23b8afc0049b780ac4e042c4e8a5436 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 28 Aug 2017 09:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=8D=A2=E8=A1=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=A4=E7=AB=AF=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/_subject_list.html.erb | 4 ++--
 app/views/subjects/show.html.erb          | 6 +++---
 public/stylesheets/css/edu-common.css     | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb
index f5d199aa6..13f58fb55 100644
--- a/app/views/subjects/_subject_list.html.erb
+++ b/app/views/subjects/_subject_list.html.erb
@@ -30,7 +30,7 @@
       <p class="font-14 course-list-index-title two_lines_show task-text-center mb5 mt5" style="height: 44px">
         <a href="javascript:void(0);" style="height: 44px;display: block;line-height: 22px;"><%= subject.name %></a>
       </p>
-      <p class="font-14 three_lines_show task-text-center mb20 color-dark-grey" style="text-align: left;">
+      <p class="font-14 three_lines_show task-text-center mb20 color-dark-grey justify break_word" style="text-align: left;">
         <%= subject.description.blank? ? "轻松学习#{subject.name}~" : subject.description %>
       </p>
       <p class="color-grey bor-bottom-greyE mb5 clearfix" style="text-align: center;">
@@ -43,7 +43,7 @@
         <a href="javascript:void(0);"><%= image_tag(url_to_avatar(subject.user), :width =>"40", :height => "40", :class => "bor-radius-all mr10 fl mt8", :alt=>"头像") %></a>
         <div class="fl" style="flex: 1;text-align: left">
           <p class="color-dark-grey"><%= subject.user.try(:show_name) %></p>
-          <p class="font-12 unit-name color-dark-grey"><%= subject.user.school_name + subject.user.identity %></p>
+          <p class="font-12 unit-name color-dark-grey"><%= subject.user.school_name %></p>
         </div>
       </div>
     </div>
diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index f236b2518..92fd2c233 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -9,7 +9,7 @@
           <% end %>
         </p>
         <div class="mt10 color-dark-grey <%= @subject.description.blank? ? 'color-light-grey' : '' %> justify">
-          <pre style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.description.blank? ? "暂未填写" : (@subject.description) %></pre>
+          <pre class="pre_word" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.description.blank? ? "暂未填写" : (@subject.description) %></pre>
         </div>
       </div>
   <% end %>
@@ -122,7 +122,7 @@
           <a href="<%= edit_subject_path(@subject) %>"><i class="fa fa-pencil fr mt10 mr5 color-grey-c edit-produce font-12"data-tip-down="编辑"></i></a>
       <% end %>
     </p>
-    <p class="mt10 mb10 color-dark-grey justify"><pre style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %></pre></p>
+    <p class="mt10 mb10 color-dark-grey justify"><pre class="pre_word" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %></pre></p>
   </div>
   <div class="edu-class-right-box ml15 user_bg_shadow bor-grey-e pl15 pt15 pr15">
     <p class="font-16">教学团队
@@ -135,7 +135,7 @@
       <p style="line-height: 15px"><%= @subject.user.try(:show_name) %></p>
       <p style="line-height: 27px" class="color-dark-grey font-12"><%= @subject.user.school_name + @subject.user.identity %></p>
     </div>
-    <p class="mb10 color-dark-grey produce justify"><pre style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.user.user_extensions.brief_introduction.blank? ? "暂未填写" : @subject.user.user_extensions.brief_introduction %></pre></p>
+    <p class="mb10 color-dark-grey produce justify"><pre class="pre_word" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.user.user_extensions.brief_introduction.blank? ? "暂未填写" : @subject.user.user_extensions.brief_introduction %></pre></p>
     <textarea id="user_produce_text" class="mb10 with100 panel-box-sizing produce_text undis" style="min-height: 100px;"></textarea>
     <input id="current_user_id" value="<%= User.current.id %>" type="hidden">
   </div>
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index be2c1a9d7..169188d77 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -177,6 +177,7 @@ a.course-bth-blue{cursor: pointer;background-color:#199ed8 ;color: #ffffff !impo
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}
 .break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
+.pre_word{white-space: pre-wrap;word-wrap: break-word;}
 .pr {position:relative;}
 .df {display:flex;}
 .w100{width: 100px;}