From ed0c9150aa9130e7902fa3b4e238a146191cd95c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 31 May 2017 13:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=90=84=E4=B8=AA=E9=97=B4=E8=B7=9D=E8=AF=B7=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb         | 14 +++++++-------
 app/views/account/user_join.html.erb     | 10 +++++-----
 app/views/layouts/login_bigdata.html.erb |  2 --
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 5de5d67c1..f1a90e837 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -1,5 +1,5 @@
-<div class="new_login ">
-  <div class="new-login-header clearfix">
+<div class="new_login" style="height: 100%;overflow:hidden;padding-bottom: 0px;">
+  <div class="new-login-header clearfix" style="left: 0;right: 0;position: absolute;top: 0;">
     <h2 class="fl">登录</h2>
     <p class="fr mt20 font-16">
       <%= link_to '首页', home_path %>
@@ -7,8 +7,8 @@
       <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %>
     </p>
   </div>
-  <div class="new_login_con">
-    <div class="new_login_box clearfix">
+  <div class="new_login_con" style="position: absolute;overflow: hidden;left: 0;right: 0;top: 70px;bottom: 225px; padding: 0">
+    <div class="new_login_box clearfix" style="left: 0;right: 0;bottom: 100px;top: 100px;position: absolute;">
       <ul class="new_login_weixin clearfix">
         <p class="" style="text-align: center; font-size: 18px;">登录</p>
         <!--<li id="login_weixin_nav_1" class="login_weixin_nav_hover" onclick="bigDataHoverLi(1);">-->
@@ -36,7 +36,7 @@
             <a href="<%= user_join_path %>" class="ml10 color-light-green">立即注册</a>
           </p>
           <div class="cl"></div>
-          <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
+          <%= form_tag(signin_path, :id => 'main_login_form', :method => 'post') do %>
             <%= back_url_hidden_field_tag %>
             <ul>
               <li class="new_loggin_users">
@@ -47,8 +47,8 @@
                 <i class="fa fa-lock font-16 ml10 color-grey"></i>
                 <input type="password" id="password_loggin_input" name="password" class="new_loggin_input" placeholder="请输入密码" onkeypress="user_name_keypress(event);">
               </li>
-              <p id="login_error_notice" class="color-red mb5" style="margin-top: -15px;"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
-              <li class="clearfix mt5" style="margin-top:5px;">
+              <p id="login_error_notice" class="color-red" style=""><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
+              <li class="clearfix mt5" style="margin-top:20px;">
                 <p class="fl">
                 <% if Setting.autologin? %>
                     <input checked="checked" class="magic-checkbox " id="autologin" name="autologin" tabindex="4" type="checkbox" value="1">
diff --git a/app/views/account/user_join.html.erb b/app/views/account/user_join.html.erb
index d62310d51..3c72114bc 100644
--- a/app/views/account/user_join.html.erb
+++ b/app/views/account/user_join.html.erb
@@ -1,5 +1,5 @@
-<div class="new_login ">
-  <div class="new-login-header clearfix">
+<div class="new_login" style="height: 100%;overflow:hidden;padding-bottom: 0px;">
+  <div class="new-login-header clearfix" style="left: 0;right: 0;position: absolute;top: 0;">
     <h2 class="fl">注册</h2>
     <p class="fr mt20 font-16">
       <%= link_to '首页', home_path %>
@@ -7,8 +7,8 @@
       <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %>
     </p>
   </div>
-  <div class="new_login_con">
-    <div class="new_login_box clearfix">
+  <div class="new_login_con" style="position: absolute;overflow: hidden;left: 0;right: 0;top: 70px;bottom: 225px; padding: 0">
+    <div class="new_login_box clearfix"  style="left: 0;right: 0;bottom: 80px;top: 80px;position: absolute;">
       <ul class="new_login_weixin fl">
         <li id="login_weixin_nav_1" class="login_weixin_nav_hover" onclick="bigDataHoverLi(1);">
           <a href="javascript:void(0);" class="login_weixin_nav_nomal"><i class="fa fa-mobile-phone font-16 mr10 mt3"></i>手机注册</a>
@@ -22,7 +22,7 @@
           <p class="fr mt10 mb10 font-12">已有账号？<a href="<%= signin_path %>" class="ml10 color-light-green">直接登录</a>
           </p>
           <div class="cl"></div>
-          <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
+          <%= form_for :user, :url => register_path, :method => 'post', :html => { :id => 'main_reg_form' } do |f| %>
             <%= error_messages_for 'user' %>
               <input type="text" name="none_name" style="display: none">
               <input type="password" name="none_psw" style="display: none">
diff --git a/app/views/layouts/login_bigdata.html.erb b/app/views/layouts/login_bigdata.html.erb
index 3da89e41b..065644268 100644
--- a/app/views/layouts/login_bigdata.html.erb
+++ b/app/views/layouts/login_bigdata.html.erb
@@ -21,9 +21,7 @@
       </div>
   <% end %>
   <div class="newMain clearfix"> <!-- 主提部分 -->
-    <div id="Container">
       <%= yield %>
-    </div>
   </div>
   <%= render :partial => 'layouts/footer' %>
 </div>