From c07f66776c86157deda62a73a7503421bfd68a3f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 12 Jun 2015 16:34:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=8B=89=E9=95=BF=E6=97=B6=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/courses/_courses_jours.html.erb | 17 +++++++++++------
public/stylesheets/courses.css | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index a097a2286..d4046c9ac 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -12,7 +12,7 @@
div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-
+
<%# reply_allow = JournalsForMessage.create_by_user? User.current %>
<%= l(:label_leave_message) %>
@@ -30,15 +30,20 @@
:placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
-
-
取 消
-
- <%= l(:button_leave_meassge)%>
-
<% end %>
+
+
<% end %>
+
+
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index e577bde66..769136f2d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -170,7 +170,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
.wzan a{ display: block;}
a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px; height:225px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:670px; border-bottom:1px dashed #CCC; padding-top:10px;}
.msg_box h4{ }
.msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; }