diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-10-13 13:58:31 -0500 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-20 13:55:06 +0200 |
| commit | 8815748feb0c9bbef9b04f07f09645ba94ea4d63 (patch) | |
| tree | 89f0ee79b36206a377f67c3acb8a453d51eaac6a /app | |
| parent | ded1e2f6576b974945aca610a2b6452120d9359a (diff) | |
| download | gitlab-ce-8815748feb0c9bbef9b04f07f09645ba94ea4d63.tar.gz | |
Change input order on Sign In form for better tabbing.unrevert-tab-order-MR
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 17 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index e6d9be5185d..bdb13bee178 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -53,6 +53,7 @@ margin: 0 0 10px; } + .login-footer { margin-top: 10px; @@ -246,3 +247,19 @@ padding: 65px; // height of footer + bottom padding of email confirmation link } } + +// For sign in pane only, to improve tab order, the following removes the submit button from +// normal document flow and pins it to the bottom of the form. For context, see !6867 & !6928 + +.login-box { + .new_user { + position: relative; + padding-bottom: 35px; + } + + .move-submit-down { + position: absolute; + width: 100%; + bottom: 0; + } +} 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" |