Commit 78f8f8cc authored by Clement Ho's avatar Clement Ho
Browse files

Merge branch '35178-remember-me-in-omniauth-box-seems-too-close-to-icons' into 'master'

add margin above Remember Me for social login

Closes #35178

See merge request !12957
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
%span.light %span.light
- has_icon = provider_has_icon?(provider) - has_icon = provider_has_icon?(provider)
= link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}" = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}"
%fieldset %fieldset.prepend-top-10
= check_box_tag :remember_me = check_box_tag :remember_me
...@@ -11,2 +11,2 @@ ...@@ -11,2 +11,2 @@
= check_box_tag :remember_me = check_box_tag :remember_me
= label_tag :remember_me, 'Remember Me' = label_tag :remember_me, 'Remember me'
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
visit new_user_session_path visit new_user_session_path
expect(page).to have_content('Sign in with') expect(page).to have_content('Sign in with')
check 'Remember Me' if remember_me check 'remember_me' if remember_me
click_link "oauth-login-#{provider}" click_link "oauth-login-#{provider}"
end end
......
Supports Markdown
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