From d2d15710b58969a762696702b944787930fbd244 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 15:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3chrome=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=83=8C=E6=99=AF=E9=BB=84=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 19 ++++++++++---------
 public/stylesheets/new_user.css  | 25 ++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index f492c5502..3ec5d3221 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -134,13 +134,14 @@
         <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
             <%= back_url_hidden_field_tag %>
             <ul>
-              <li>
-                <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input new_login_users',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
+              <li class="new_login_li new_login_users">
+                <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
               </li>
-              <li>
-                <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input new_login_lock' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
-                <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+              <li class="new_login_li  new_login_lock">
+                <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+
               </li>
+              <span class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></span>
               <li>
                 <% if Setting.autologin? %>
                     <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
@@ -173,19 +174,19 @@
             <%= error_messages_for 'user' %>
             <ul>
               <li>
-                <%= f.text_field :mail, :size => 25, :class => 'new_loggin_input' , :placeholder => "请输入邮箱地址"%>
+                <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
                 <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
               </li>
               <li>
-                <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_loggin_input' %>
+                <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
                 <p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
               </li>
               <li>
-                <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_loggin_input' %>
+                <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
                 <p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
               </li>
               <li>
-                <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_loggin_input'%>
+                <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
                 <p class="new_login_error" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</p>
               </li>
               <li>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 91eeb58fd..49d86c446 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1667,7 +1667,7 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
     background:url(../images/login/icons_login.png) 0 -69px no-repeat;
     padding-left:10px;
 }
-input.new_loggin_input{
+input.new_register_input{
     width:250px;
     height:45px;
     background:#fff;
@@ -1679,7 +1679,26 @@ input.new_loggin_input{
     padding-left:15px;
     margin-bottom:2px;
 }
-input.new_login_users{
+input.new_loggin_input{
+    -webkit-box-shadow: 0 0 0px 1000px white inset;
+    outline: none;
+    width:205px;
+    height:45px;
+    border:none;
+}
+.new_loggin_li{ width:250px;
+    height:45px;
+    background:#fff;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    padding-left:15px;
+    margin-bottom:2px;
+    margin-bottom:20px;
+}
+.new_login_users{
     background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
     width:215px;
     height:45px;
@@ -1691,7 +1710,7 @@ input.new_login_users{
     padding-left:50px;
     margin-bottom:2px;
 }
-input.new_login_lock{
+.new_login_lock{
     background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
     width:215px;
     height:45px;