From 312fa61489eab94558d2fc3c50ede0ee76d47670 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Jun 2016 15:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=BA=BF=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 3 ++-
 public/stylesheets/new_user.css  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 8d11a0697..23acabd1f 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -139,8 +139,9 @@
               </li>
               <li class="new_login_lock">
                 <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+                <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
               </li>
-              <p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+
               <li>
                 <% if Setting.autologin? %>
                     <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 836596244..c2e850dbe 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1672,6 +1672,7 @@ input.new_register_input{
     width:250px;
     height:45px;
     border:none;
+    outline: none;
 }
 input.new_loggin_input{
     -webkit-box-shadow: 0 0 0px 1000px white inset;