From 60b429b13d2af0b195f97d825a47f2a529e15a61 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 10:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=88=90=E5=8A=9F=E4=B8=8D?=
 =?UTF-8?q?=E7=BB=99=E6=8F=90=E7=A4=BA=20=E8=AF=BE=E7=A8=8B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=BF=87=E5=B0=91=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?=
 =?UTF-8?q?=E7=BB=99=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/add_exist_file_to_course.js.erb  | 1 -
 app/views/users/add_exist_file_to_project.js.erb | 1 -
 public/stylesheets/new_user.css                  | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 637570bfb..08737f5ca 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,5 +1,4 @@
 <% if @flag == true%>
-alert('发送成功')
 closePopUp();
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 637570bfb..08737f5ca 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,5 +1,4 @@
 <% if @flag == true%>
-alert('发送成功')
 closePopUp();
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index d7f79943e..57bd6685a 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -452,7 +452,7 @@ input.sendSourceText:hover {background-color:#297fb8;}
 /*input.sendSourceText:hover {font-size:14px; color:#ffffff;}*/
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
-.courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:scroll; overflow-x:hidden;}
+.courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden;}
 .popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px;  /* background:#fff; */ -moz-border-radius:5px;  /* -webkit-border-radius:5px; */  /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */  /* overflow:auto; */}
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}