From e9d61a928a1b60364d84284dc1397d46d471154e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 28 Sep 2015 16:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AEissue?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E8=BE=B9=E7=95=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/journals_helper.rb | 2 +- public/stylesheets/project.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 1a0b9ca0d..3591a0168 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -119,7 +119,7 @@ module JournalsHelper content << textAreailizable(journal, :notes) css_classes = "wiki" css_classes << " editable" if editable - content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px") + content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes) end def link_to_in_place_notes_editor(text, field_id, url, options={}) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index f56512fb9..2806a1dbe 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -221,6 +221,7 @@ a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;} +.talk_info img {max-width:100%;} a.talk_edit{ color:#426e9a; margin-right:5px;} a:hover.talk_edit{ color:#ff5722;} .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} @@ -877,4 +878,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} /*version*/ .time_tracter{color: #64BDD9;padding: 5px;} +.wiki {width: 510px;} +.wiki img {max-width:100%;}