diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-20 15:59:35 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-20 15:59:35 +0300 |
| commit | 2510345ee5f36c9cbe7088f7dce9402645c3fcf6 (patch) | |
| tree | 9917ec2e743e0028311feb4344d719b10deecd56 /app/views | |
| parent | 8e218edbddd9a6fda34543e1f1ee39e44772c369 (diff) | |
| parent | 8815748feb0c9bbef9b04f07f09645ba94ea4d63 (diff) | |
Merge branch 'unrevert-tab-order-MR' into 'master'
Change input order on Sign In form for better tabbing.
## What does this MR do?
This unreverts 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup.
cc: @ClemMakesApps
## Screenshots (if relevant)
(Disregard the grey borders on invalid inputs -- for some reason, Gifox isn't picking up some colors for me :shrug: )
## Does this MR meet the acceptance criteria?
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867
See merge request !6928
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index a96b579c593..525e7d99d71 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -5,6 +5,8 @@ %div.form-group = f.label :password = f.password_field :password, class: "form-control bottom", required: true, title: "This field is required." + %div.submit-container.move-submit-down + = f.submit "Sign in", class: "btn btn-save" - if devise_mapping.rememberable? .remember-me.checkbox %label{for: "user_remember_me"} @@ -12,5 +14,3 @@ %span Remember me .pull-right = link_to "Forgot your password?", new_password_path(resource_name) - %div.submit-container - = f.submit "Sign in", class: "btn btn-save" |