From 757da1ec0a665f4e178b32b76f87b26fca6c01b3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 26 Aug 2015 09:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb  | 7 +------
 public/javascripts/new_user.js | 1 +
 public/stylesheets/users.css   | 7 +++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 23fc1a3ad..c25363323 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -1,9 +1,4 @@
-<style>
-  div.content{padding-top:10px;}
-  .pcontent>.school_list,.content>.school_list { padding-left: 5px;}
-</style>
-
-<div id="RSide" class="fl">
+<div class="fl">
   <div id="users_setting">
     <div id="users_tb_" class="users_tb_">
       <ul>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 377842b66..7fc515c4a 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -1,6 +1,7 @@
 $(function(){
     //右侧最小高度 = 左侧高度 - 15px   保证两边高度基本一样，页面美观
     $("#RSide").css("min-height",$("#LSide").height()-15);
+    $("#users_setting").css("min-height",$("#LSide").height()-35);
 
     //头像相关
     $("#homepage_portrait_image").live("mouseover",function(){
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 9a809b7ce..967c7770b 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -70,7 +70,7 @@ a.select_btn_select{ background:#64bddb; color:#fff;}
 .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;/*滑动门的宽度*/}
+#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; }
@@ -144,4 +144,7 @@ div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
 span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
 span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
 div.ke-toolbar .ke-outline{border:none;}
-.cr{clear:  right;}
\ No newline at end of file
+.cr{clear:  right;}
+
+div.content{padding-top:10px;}
+.pcontent>.school_list,.content>.school_list { padding-left: 5px;}
\ No newline at end of file