From d3869b03cd8a34f6c3396bfa2403b5f0ccaaefcb Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Mon, 31 Aug 2015 15:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E7=89=88=E9=9D=A2?=
 =?UTF-8?q?=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/layouts/new_base_user.html.erb | 2 +-
 app/views/users/user_resource.html.erb   | 2 +-
 public/stylesheets/new_user.css          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index a9a204e0c..c1065415f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -51,7 +51,7 @@
           <% end %>
           <div class="cl"></div>
           <% if @user.user_extensions && @user.user_extensions.identity %>
-              <p class="mb20 c_dark f14">
+              <p class="mb8 c_dark f14">
                 <%= get_user_roll @user %>
               </p>
           <% end%>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 819bec04d..2ecda7758 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -93,7 +93,7 @@
     </ul>
   </div>
   <form id="resources_list_form">
-  <div id="resources_list" class="resourcesList">
+  <div id="resources_list">
 
      <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
 
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 45172501d..e32284115 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -434,7 +434,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .boxContainer {height:33px; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
-.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
+.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}