From 600003e48c3c31f3a5b952ff62693de70a2070e7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 10 Apr 2015 15:54:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E4=B8=AD?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=A4=A7=E5=9B=BE=E7=89=87=EF=BC=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb  | 2 +-
 app/views/layouts/base_forums.html.erb | 2 +-
 app/views/layouts/base_memos.html.erb  | 2 +-
 public/stylesheets/application.css     | 3 +++
 public/stylesheets/nyan.css            | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index fe2f757c3..59ed1092e 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -16,7 +16,7 @@
               </td>
             </tr>
 			<tr>
-              <td style="word-break: break-all;word-wrap: break-word;">
+              <td style="word-break: break-all;word-wrap: break-word;" class="upload_img">
                 <p>
                   <%= textAreailizable forum.description%>
                 </p>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index f12b3186d..4d79f50f9 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -53,7 +53,7 @@
 							<div class="sidebar-forums">
 								<div class="forums-line">																																							
 									<div class="forums-title"><%= @forum.name %></div>
-									<div class="forums-description"><%=  @forum.description.html_safe %></div>
+									<div class="forums-description upload_img"><%=  @forum.description.html_safe %></div>
 								</div>																																		
 							<!--informations-->
 								<div class="formus-first-title" >创建人信息</div>
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 1f815576f..d955d5d7b 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -84,7 +84,7 @@
 							<div class="sidebar-forums">
 								<div class="forums-line">																																							
 								<div class="forums-title"><%= @forum.name %></div>
-								<div class="forums-description"><%=  @forum.description.html_safe %></div>
+								<div class="forums-description upload_img"><%=  @forum.description.html_safe %></div>
 								</div>																																		
 							<!--informations-->
 								<div class="formus-first-title" >创建人信息</div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fc2f55086..658f30480 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -8,6 +8,9 @@ h3, .wiki h2 {font-size: 15px; padding-left: 5px}
 h4, .wiki h3 {font-size: 13px;}
 h4 {border-bottom: 1px dotted #bbb;}
 
+/*上传图片处理*/
+.upload_img img{max-width: 100%;}
+
 /****翻页***/
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 ul.wlist li{float: left;}
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index ac7142c71..de4dcb65c 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -750,9 +750,9 @@ div.actions input[type="text"] {
 .memo-content img, .comments img {
     overflow: hidden;
     /*width: 100%;*/
-    max-width: 500px;
+    max-width: 100%;
     height: auto !important;
-    width: expression(this.width > 500 ? "500px" : this.width+"px");
+    /*width: expression(this.width > 500 ? "500px" : this.width+"px");*/
 }
 
 table.content-text-list tbody tr td.sticky, div.memo-section .sticky {