Pulldown login form: Improve looks

Also contains some small improvements for main login form.
pull/1262/head
Michael Frister 11 years ago
parent 584c5013f7
commit 978879c432
  1. 9
      app/assets/stylesheets/content/_accounts.css.sass
  2. 13
      app/assets/stylesheets/layout/_top_menu.css.sass
  3. 39
      app/views/account/_login.html.erb

@ -32,6 +32,7 @@
#login-form
margin-left: auto
margin-right: auto
padding-top: 20px
// label width + label padding-right + input width + input padding-left + input border
width: 155px + 5px + $content_from_input_width + 10px + 2px
@ -65,7 +66,7 @@
// use id selectors to be specific enough to override general content and top-menu definitions
#content .login-auth-providers, #top-menu #nav-login-content .login-auth-providers
width: 471px
margin-top: 10px
margin-top: 25px
h3
border: none
@ -129,8 +130,10 @@
#top-menu #nav-login-content .login-auth-providers
h3
&:before
width: 100%
span
background: $header_drop_down_bg_color
.login-auth-provider-list
margin-top: -25px
margin-bottom: 8px
margin-top: -15px
margin-bottom: 10px

@ -156,12 +156,12 @@
border: 0px solid #194E60
border-top: 0
line-height: 19px
padding: 10px
padding: 15px 10px 15px 15px
@include header-fonts(#555555, 13px)
input[type=text]
height: 16px
width: 150px
width: 175px
border: 1px solid #CCCCCC
padding: 5px
@include default-transition
@ -169,22 +169,21 @@
border: 1px solid #888888
input[type=password]
height: 16px
width: 150px
width: 175px
border: 1px solid #CCCCCC
padding: 5px
@include default-transition
&:hover
border: 1px solid #888888
div a
input[type=submit]
height: 28px
a
display: inline
padding: 0
font-family: $font_family_normal
font-weight: normal
table td
padding: 3px
#optional_login_fields
white-space: nowrap
margin: 5px 0 0 3px
#quick-search
float: right

@ -43,24 +43,27 @@ See doc/COPYRIGHT.rdoc for more details.
:id => 'password-pulldown' %></td>
<td><input type="submit" name="login" value="<%=l(:button_login)%>" class="button_highlight" /></td>
</tr>
<tr>
<td>
<% if Setting.autologin? %>
<label for="autologin"><%= check_box_tag 'autologin', 1, false %> <%= l(:label_stay_logged_in) %></label>
<% elsif Setting.self_registration? %>
<%# show here if autologin is disabled, otherwise below lost_password link %>
<%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
<% end %>
</td>
<td>
<% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), {:controller => '/account', :action => 'lost_password'} %>
<% end %>
<% if Setting.autologin? && Setting.self_registration? %>
<%# show here if autologin is enabled, otherwise below login field %>
<%= '<br>'.html_safe if Setting.lost_password? %>
<%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
<% end %>
</td>
</tr>
</table>
<div id = "optional_login_fields" style = "top = 10px; white-space:nowrap">
<% if Setting.autologin? %>
<label for="autologin"><%= check_box_tag 'autologin', 1, false %> <%= l(:label_stay_logged_in) %></label>
<% end %>
<% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), {:controller => '/account', :action => 'lost_password'} %>
<% end %>
<% if !User.current.logged? %>
<% if Setting.self_registration? %>
<%= "|" if Setting.lost_password? %>
<%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
<% end %>
<br>
<%= render :partial => 'account/auth_providers' %>
<% end %>
</div>
<%= render :partial => 'account/auth_providers' %>
<% end %>
</div>

Loading…
Cancel
Save