diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-07-21 21:19:25 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-07-24 12:00:46 -0500 |
| commit | 2c3e98f727232194648b46a9d8952e20f544bf85 (patch) | |
| tree | fa32e7d921c069c11162f42a525c56c8604f4fae | |
| parent | 6fe5ddc0081809c1cb418f4cfdef21b91c957309 (diff) | |
| download | gitlab-ce-2c3e98f727232194648b46a9d8952e20f544bf85.tar.gz | |
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
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 4 | ||||
| -rw-r--r-- | spec/support/login_helpers.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index e80d10dc8f1..bfd7dd25a7d 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -7,6 +7,6 @@ %span.light - 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}" - %fieldset + %fieldset.prepend-top-10 = check_box_tag :remember_me - = label_tag :remember_me, 'Remember Me' + = label_tag :remember_me, 'Remember me' diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index b410a652126..e538c5dd5a7 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -62,7 +62,7 @@ module LoginHelpers visit new_user_session_path 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}" end |