Commit f9af2df0 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '358328-replace-generic-checkbox-with-gitlab-ui-styled-checkbox-in-app-views-devise-sessions' into 'master'

Replace generic checkbox with GitLab UI styled checkbox in app/views/devise/sessions/_new_base.html.haml

See merge request gitlab-org/gitlab!84857
parents 4d5a577c ee672e1e
= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors js-sign-in-form', aria: { live: 'assertive' }, data: { testid: 'sign-in-form' }}) do |f| = gitlab_ui_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors js-sign-in-form', aria: { live: 'assertive' }, data: { testid: 'sign-in-form' }}) do |f|
.form-group .form-group
= f.label _('Username or email'), for: 'user_login', class: 'label-bold' = f.label _('Username or email'), for: 'user_login', class: 'label-bold'
= f.text_field :login, value: @invite_email, class: 'form-control gl-form-input top js-username-field', autofocus: 'autofocus', autocapitalize: 'off', autocorrect: 'off', required: true, title: _('This field is required.'), data: { qa_selector: 'login_field', testid: 'username-field' } = f.text_field :login, value: @invite_email, class: 'form-control gl-form-input top js-username-field', autofocus: 'autofocus', autocapitalize: 'off', autocorrect: 'off', required: true, title: _('This field is required.'), data: { qa_selector: 'login_field', testid: 'username-field' }
...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
= f.password_field :password, class: 'form-control gl-form-input bottom', autocomplete: 'current-password', required: true, title: _('This field is required.'), data: { qa_selector: 'password_field' } = f.password_field :password, class: 'form-control gl-form-input bottom', autocomplete: 'current-password', required: true, title: _('This field is required.'), data: { qa_selector: 'password_field' }
- if devise_mapping.rememberable? - if devise_mapping.rememberable?
%div %div
%label{ for: 'user_remember_me' } .gl-display-inline-block
= f.check_box :remember_me = f.gitlab_ui_checkbox_component :remember_me, _('Remember me')
%span= _('Remember me') .gl-float-right
.float-right
- if unconfirmed_email? - if unconfirmed_email?
= link_to _('Resend confirmation email'), new_user_confirmation_path = link_to _('Resend confirmation email'), new_user_confirmation_path
- else - else
......
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