From 8bc63bc0461d64ebc79dad1a071e291fb800da20 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 2 May 2017 14:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E8=B5=84=E6=96=99=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            |  1 +
 app/views/my/account.html.erb         | 16 ++++++++--------
 public/stylesheets/css/edu-common.css |  2 +-
 public/stylesheets/css/edu-user.css   |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

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| %>
       <ul>
         <li class="clearfix mb10">
-          <label class="panel-form-label fl"><span class="color-red mr5">*</span>真实姓名：</label>
+          <label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>真实姓名</label>
           <input type="text" id="lastname" name="lastname" maxlength="20" nh_required="1" required="required" class="input-height select-width panel-box-sizing fl" placeholder="填写您的真实姓名" value="<%= @user.lastname+@user.firstname %>">
 
           <div class="cl"></div>
           <span class="color-orange fl hint none" id="lastname_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请填写您的真实姓名</span>
         </li>
         <li class="clearfix mb10">
-          <label class=" panel-form-label fl "><span class="color-red mr5">*</span>我的性别：</label>
+          <label class=" panel-form-label fl mr18"><span class="color-red mr5">*</span>我的性别</label>
           <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
                 <span class="fl mt10 mr15">
 		            <input type="radio" name="sex" value="0">
@@ -50,7 +50,7 @@
           <div class="cl"></div>
         </li>
         <li class="clearfix mb10 hascontont">
-          <label class="panel-form-label fl"><span class="color-red mr5">*</span>职业：</label>
+          <label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>职业</label>
           <select id="userIdentity" name="identity" required="required" nh_required="1" class="fl input-height mr15 select-width">
             <option value="-1" style="display:none">请选择职业</option>
             <option value="0">教师</option>
@@ -77,14 +77,14 @@
           <span class="color-orange fl hint none" id="identity_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请选择你的职业/职称</span>
         </li>
         <li class="clearfix mb10" id="number">
-          <label class="panel-form-label fl"><span class="color-red mr5">*</span>学号：</label>
+          <label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>学号</label>
           <input type="text" nhname="tag_1" nh_tag_1="true" id="user_student_id" class="input-height select-width panel-box-sizing fl" name="no" value="<%= @user.user_extensions.student_id %>" placeholder="填写您的学号">
 
           <div class="cl"></div>
           <span class="color-orange fl hint none" id="student_id_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请选择你的职业</span>
         </li>
         <li class="clearfix mb10">
-          <label class="panel-form-label fl"><span class="color-red mr5">*</span>地区：</label>
+          <label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>地区</label>
           <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="fl input-height mr15 select-width">
             <option value="0">请选择所在省份</option>
             <option value="北京">北京</option>
@@ -131,7 +131,7 @@
           <span class="color-orange fl none" id="province_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请选择你所在的省份/城市</span>
         </li>
         <li class="clearfix mb10">
-          <label class="panel-form-label fl"><span class="color-red mr5">*</span>单位名称：</label>
+          <label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>单位名称</label>
           <input nhname="tag" autocomplete="off" maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-form-40 task-height-40 panel-box-sizing fl" type="text" value="<%= User.current.user_extensions.school.try(:name) %>" placeholder="在校师生请写所在学校，其它用户填写所在工作单位"/>
           <input nhname="tag" nh_tag_4="true" class="fl" id="occupation" name="occupation" style="display: none;" type="text" value="<%= @user.user_extensions.school.try(:id) %>"/> <!-- 单位名称的test框选中下拉列表框的id -->
           <p id="no_school_hint" class="none fl ml10 mt8">你的单位不在列表中？请点击<a href="javascript:void(0);" class="link-color-blue">申请添加</a></p>
@@ -139,14 +139,14 @@
           <span class="color-orange fl none" id="school_name_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请从下拉列表中选择你的单位</span>
         </li>
         <li class="clearfix mb10 <%= @user.user_extensions.school.blank? ? 'none' : '' %>" id="user_department_li">
-          <label class="panel-form-label fl">学院/单位：</label>
+          <label class="panel-form-label fl mr18">学院/单位</label>
           <input type="text" autocomplete="off" id="department" name="department" class="task-form-40 task-height-40 panel-box-sizing fl" placeholder="所在学院或者所在部门" value="<%= @user.user_extensions.department.try(:name) %>">
           <input nhname="tag" nh_tag_5="true" class="fl" id="department_id" name="department_id" style="display: none;" type="text" value="<%= @user.user_extensions.department.try(:id) %>"/> <!-- 单位名称的test框选中下拉列表框的id -->
           <p id="no_department_hint" class="none fl ml10 mt8">你的部门不在列表中？请点击<a href="javascript:void(0);" class="link-color-blue">申请添加</a></p>
           <div class="cl"></div>
         </li>
         <li class="clearfix mb10">
-          <label class="panel-form-label fl">介绍：</label>
+          <label class="panel-form-label fl mr18">介绍</label>
           <textarea class="task-form-80 task-height-150 panel-box-sizing fl" name="brief_introduction" style="width:82%; resize: none;" placeholder=" 一句话介绍一下自己吧~（最多100个字符）"><%= @user.user_extensions.brief_introduction %></textarea>
 
           <div class="cl"></div>
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;}