From f39a98ee6851e9ed20f2171857df341990fa83bd Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 15:31:02 +0800
Subject: [PATCH] =?UTF-8?q?bug#2841:=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=9A=E4=B8=BB=E9=A2=98=E7=9A=84=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=92=8C=E6=8F=8F=E8=BF=B0=E7=9A=84=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E4=BD=8D=E7=BD=AE=E5=BA=94=E8=AF=A5=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/show.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index ba9583e7d..40d16cce4 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,4 +1,5 @@
 <style type="text/css">
+    div.talk_new .ke-container{margin-left:57px;}
     /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
@@ -127,13 +128,17 @@ function nh_init_board(params){
             var editor = params.kindutil.create(params.textarea, {
 //                allowPreviewEmoticons : false,
 //                allowImageUpload : false,
-                resizeType : 1,minWidth:"1px",width:"565px",height:"150px",
+                resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
                 allowFileManager:true,uploadJson:"/kindeditor/upload",
                 fileManagerJson:"/kindeditor/filemanager",
                 afterChange:function(){//按键事件
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
+                  var userAgent = navigator.userAgent.toLowerCase();
+                  if(/trident/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);