From e2869faa0856d332e61d0b089cfd4825b52d428c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 26 Aug 2015 15:17:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb | 6 ++++--
 public/stylesheets/new_user.css              | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 3a4c3496c..ad6f0fa2f 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -7,8 +7,10 @@
 
   <div class=" mt10">
     <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-    <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120" readonly="readonly" value="<%= homework.end_time%>" >
-    <%= calendar_for('homework_end_time')%>
+    <div class="calendar_div fl">
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>" >
+      <%= calendar_for('homework_end_time')%>
+    </div>
     <!--<div class="fl DateBorder mr10">-->
       <!--<a href="javascript:void(0);" class="pic_date  "></a>-->
     <!--</div>-->
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index df47c9e77..d2ee3d7f9 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -852,8 +852,10 @@ img.ui-datepicker-trigger {
     width:16px;
     height:15px;
     float:left;
+    margin: 7px;
 }
-
+.calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
+.calendar_div{border: 1px solid #d9d9d9;}