diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-07-21 21:19:25 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-07-21 21:19:25 +0000 |
| commit | b5c3666fcc5c74e6f8896dc6f994521e1e91c887 (patch) | |
| tree | b8ef588b807778fe4f3ab661fecc28ffb8a518b3 | |
| parent | f23d74345a3e64ff7560cbff3019a86d399bd3ad (diff) | |
| parent | a4c6a03b935fd09098f7da821d9a1c0a30b88859 (diff) | |
| download | gitlab-ce-b5c3666fcc5c74e6f8896dc6f994521e1e91c887.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 701de9c8c19..c714d1b08a6 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -64,7 +64,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 |