Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

登录注册页的各个间距请统一调整

This commit is contained in:
daiao 2017-05-31 13:58:31 +08:00
parent b6dff64dc7
commit ed0c9150aa
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/account/login.html.erb
View File

@ -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">

10
app/views/account/user_join.html.erb
View File

@ -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">

2
app/views/layouts/login_bigdata.html.erb
View File

@ -21,9 +21,7 @@
</div>
<% end %>
<div class="newMain clearfix"> <!-- 主提部分 -->
<div id="Container">
<%= yield %>
</div>
</div>
<%= render :partial => 'layouts/footer' %>
</div>