Commit 7984d3ca00edf45fed8bad6ed921060244970977
1 parent
083990c7
Exists in
master
and in
4 other branches
Minor UI fixes for login page
Showing
5 changed files
with
14 additions
and
21 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -193,19 +193,6 @@ li.note { | @@ -193,19 +193,6 @@ li.note { | ||
| 193 | } | 193 | } |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | -.remember_me { | ||
| 197 | - text-align: left; | ||
| 198 | - | ||
| 199 | - input { | ||
| 200 | - margin: 0; | ||
| 201 | - } | ||
| 202 | - | ||
| 203 | - span { | ||
| 204 | - padding-left: 5px; | ||
| 205 | - } | ||
| 206 | -} | ||
| 207 | - | ||
| 208 | - | ||
| 209 | .rss-icon { | 196 | .rss-icon { |
| 210 | img { | 197 | img { |
| 211 | width: 24px; | 198 | width: 24px; |
| @@ -217,7 +204,6 @@ li.note { | @@ -217,7 +204,6 @@ li.note { | ||
| 217 | } | 204 | } |
| 218 | } | 205 | } |
| 219 | 206 | ||
| 220 | - | ||
| 221 | .supp_diff_link, | 207 | .supp_diff_link, |
| 222 | .show-all-commits { | 208 | .show-all-commits { |
| 223 | cursor: pointer; | 209 | cursor: pointer; |
app/assets/stylesheets/sections/login.scss
| 1 | /* Login Page */ | 1 | /* Login Page */ |
| 2 | body.login-page{ | 2 | body.login-page{ |
| 3 | background: #474D57; | 3 | background: #474D57; |
| 4 | - .container .content { padding-top: 5%; } | 4 | + .container .content { padding-top: 4%; } |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | .login-box{ | 7 | .login-box{ |
| @@ -37,3 +37,11 @@ body.login-page{ | @@ -37,3 +37,11 @@ body.login-page{ | ||
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | .login-box a.forgot{float: right; padding-top: 6px} | 39 | .login-box a.forgot{float: right; padding-top: 6px} |
| 40 | + | ||
| 41 | +.remember_me { | ||
| 42 | + text-align: left; | ||
| 43 | + | ||
| 44 | + input { | ||
| 45 | + margin: 2px; | ||
| 46 | + } | ||
| 47 | +} |
app/views/devise/passwords/new.html.haml
| 1 | = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| | 1 | = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| |
| 2 | %h3.page-title Reset password | 2 | %h3.page-title Reset password |
| 3 | - %br | ||
| 4 | = devise_error_messages! | 3 | = devise_error_messages! |
| 5 | = f.email_field :email, placeholder: "Email", class: "text" | 4 | = f.email_field :email, placeholder: "Email", class: "text" |
| 6 | %br/ | 5 | %br/ |
app/views/devise/sessions/_new_base.html.haml
| @@ -2,12 +2,13 @@ | @@ -2,12 +2,13 @@ | ||
| 2 | = f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus" | 2 | = f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus" |
| 3 | = f.password_field :password, class: "text bottom", placeholder: "Password" | 3 | = f.password_field :password, class: "text bottom", placeholder: "Password" |
| 4 | - if devise_mapping.rememberable? | 4 | - if devise_mapping.rememberable? |
| 5 | - .clearfix.inputs-list | 5 | + .clearfix.append-bottom-10 |
| 6 | %label.checkbox.remember_me{for: "user_remember_me"} | 6 | %label.checkbox.remember_me{for: "user_remember_me"} |
| 7 | = f.check_box :remember_me | 7 | = f.check_box :remember_me |
| 8 | %span Remember me | 8 | %span Remember me |
| 9 | - = f.submit "Sign in", class: "btn-create btn" | ||
| 10 | - .pull-right | ||
| 11 | - = link_to "Forgot your password?", new_password_path(resource_name), class: "btn" | 9 | + %div |
| 10 | + = f.submit "Sign in", class: "btn-create btn" | ||
| 11 | + .pull-right | ||
| 12 | + = link_to "Forgot your password?", new_password_path(resource_name), class: "btn" | ||
| 12 | 13 | ||
| 13 | 14 |