Commit 7984d3ca authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Minor UI fixes for login page

parent 083990c7
...@@ -193,19 +193,6 @@ li.note { ...@@ -193,19 +193,6 @@ li.note {
} }
} }
.remember_me {
text-align: left;
input {
margin: 0;
}
span {
padding-left: 5px;
}
}
.rss-icon { .rss-icon {
img { img {
width: 24px; width: 24px;
...@@ -217,7 +204,6 @@ li.note { ...@@ -217,7 +204,6 @@ li.note {
} }
} }
.supp_diff_link, .supp_diff_link,
.show-all-commits { .show-all-commits {
cursor: pointer; cursor: pointer;
......
/* Login Page */ /* Login Page */
body.login-page{ body.login-page{
background: #474D57; background: #474D57;
.container .content { padding-top: 5%; } .container .content { padding-top: 4%; }
} }
.login-box{ .login-box{
...@@ -37,3 +37,11 @@ body.login-page{ ...@@ -37,3 +37,11 @@ body.login-page{
} }
.login-box a.forgot{float: right; padding-top: 6px} .login-box a.forgot{float: right; padding-top: 6px}
.remember_me {
text-align: left;
input {
margin: 2px;
}
}
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
%h3.page-title Reset password %h3.page-title Reset password
%br
= devise_error_messages! = devise_error_messages!
= f.email_field :email, placeholder: "Email", class: "text" = f.email_field :email, placeholder: "Email", class: "text"
%br/ %br/
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
= f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus" = f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
= f.password_field :password, class: "text bottom", placeholder: "Password" = f.password_field :password, class: "text bottom", placeholder: "Password"
- if devise_mapping.rememberable? - if devise_mapping.rememberable?
.clearfix.inputs-list .clearfix.append-bottom-10
%label.checkbox.remember_me{for: "user_remember_me"} %label.checkbox.remember_me{for: "user_remember_me"}
= f.check_box :remember_me = f.check_box :remember_me
%span Remember me %span Remember me
= f.submit "Sign in", class: "btn-create btn" %div
.pull-right = f.submit "Sign in", class: "btn-create btn"
= link_to "Forgot your password?", new_password_path(resource_name), class: "btn" .pull-right
= link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
.login-box .login-box
%h3.page-title Sign in %h3.page-title Sign in
%br
- if ldap_enabled? - if ldap_enabled?
%ul.nav.nav-tabs %ul.nav.nav-tabs
%li.active %li.active
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment