diff --git a/.gitignore b/.gitignore
index bb4b68554..fcf83b00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.swp
/.project
/.idea
+/.idea/bigdate.iml
/.bundle
*.swp
/config/database.yml
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index b55be65f8..18c958aa7 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -20,14 +20,14 @@
<%= labelled_form_for :user, @user, :url => {:action => "account"}, :html => {:id => 'my_account_form', :method => :post} do |f| %>
-
-
+
请填写您的真实姓名
-
-
+
<% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
@@ -50,7 +50,7 @@
-
-
+
-
-
+
请选择你的职业
-
-
+
-
-
+
你的单位不在列表中?请点击申请添加
@@ -139,14 +139,14 @@
请从下拉列表中选择你的单位
-
-
+
你的部门不在列表中?请点击申请添加
-
-
+
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 93d805d96..4bf252351 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -57,7 +57,7 @@ a:hover.link-color-grey02{ color:red;}
.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}
.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}
.ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml50{ margin-left: 50px;}.ml230{ margin-left: 230px;}
-.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr60{ margin-right:60px;}
+.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr60{ margin-right:60px;}
.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}
.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}
.pl5{ padding-left:5px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}
diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css
index 938a7bfde..05de849f7 100644
--- a/public/stylesheets/css/edu-user.css
+++ b/public/stylesheets/css/edu-user.css
@@ -154,7 +154,7 @@
#number{display:none;}
#teacher,#profession{display:none;}
input.input-height,select.input-height{ height: 40px;}
-input.select-width,select.select-width{ width:140px; text-align: center; padding:5px; }
+input.select-width,select.select-width{ width:140px; padding:5px;}
label.label-width12{ width:12%; text-align: right;}
input.input-width87,textarea.input-width87{ width:87%; }
textarea.input-width87{ width:87%; line-height: 1.9;}