diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-11-17 20:14:56 +0100 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-11-18 21:40:18 +0100 |
| commit | 0bd5370911aa21c76b5d7e39a484c6ac50d4200a (patch) | |
| tree | e08dc8befd57248560e5f54759da91dd8b0c11da | |
| parent | 2488bff877e653f55d8b6817a1111168be4cab16 (diff) | |
| download | gitlab-ce-super-secret-login-upgrade.tar.gz | |
Un-un-revert signin tab order fix.super-secret-login-upgrade
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 23 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 4 |
2 files changed, 2 insertions, 25 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 10f67b47998..54c89d75e94 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -255,26 +255,3 @@ } } -// 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; - - @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { - .forgot-password { - float: none !important; - margin-top: 5px; - } - } - } - - .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 21b89580818..84e13693dfd 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -5,8 +5,6 @@ %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"} @@ -14,3 +12,5 @@ %span Remember me .pull-right.forgot-password = link_to "Forgot your password?", new_password_path(resource_name) + %div.submit-container.move-submit-down + = f.submit "Sign in", class: "btn btn-save" |