From 686af68026f6d0e76fd856b902795a829613ed31 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 26 Aug 2015 14:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E3=80=81=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
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_fanslist.html.erb   | 2 +-
 public/stylesheets/new_user.css          | 3 ++-
 public/stylesheets/users.css             | 2 --
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index b5d9ba628..315960a4c 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -47,7 +47,7 @@
           <% end%>
         </div>
         <div>
-          <div class="homepageImageName hidden">
+          <div class="homepageImageName hidden db">
             <%= @user.login %>
           </div>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 29176aadc..8f8a4294a 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -7,7 +7,7 @@
 
     }
 </script>
-  <div class="courses_box">
+  <div class="courses_box" id="users_setting">
     <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
       <% if @action == 'fans' %>
         <h2 class="courses_h2 fl">粉丝</h2>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index d9f381e20..df47c9e77 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -10,6 +10,7 @@ a:hover,a:active{color:#000;}
 
 /*常用*/
 /*#RSide{ background:#fff;}*/
+#users_setting{clear:both;width:730px;background: #fff;padding: 10px;/*滑动门的宽度*/}
 /*上传图片处理*/
 .upload_img img{max-width: 100%;}
 blockquote img{max-width: 100%;}
@@ -342,7 +343,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 a.sendButtonBlue {color:#15bccf;}
 a.sendButtonBlue:hover {color:#ffffff;}
 .resourcesSelectSendButton:hover {background-color:#15bccf;}
-.db {display:block;}
+.db {display:block !important;}
 
 .dropdown-menu {
     position: absolute;
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 4a54724fd..eb9309eab 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -69,8 +69,6 @@ a.select_btn_select{ background:#64bddb; color:#fff;}
 .wlist a{ float:left; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;}
 .wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;}
 .wlist_select a { background-color:#48aac9; color:#fff;}
-/* 设置 */
-#users_setting{clear:both;width:730px;background: #fff;padding: 10px;/*滑动门的宽度*/}
 /* TAB 切换效果 */
 .users_tb_{ border-bottom:3px solid #CCC; height:26px; }
 .users_tb_ ul{height:26px; }