diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-08-27 16:36:47 +0200 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-08-27 16:37:27 +0200 |
| commit | 1402f1b3ea217af5fd2e7c87369f4e73e114414f (patch) | |
| tree | cd4510b2cd772978304653e091f67e89b17ea2a8 | |
| parent | 7556875eb8a1759551fd271781b88641b60cc4b8 (diff) | |
| download | gitlab-ce-44943-update-presentation-for-sso-providers-on-log-in-page.tar.gz | |
fixes tests by adding missing CSS class44943-update-presentation-for-sso-providers-on-log-in-page
- shows provider image only if exists
- cleans up CSS
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 6 | ||||
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 18a7db79d2b..cb1901819c4 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -124,11 +124,7 @@ img { width: 18px; height: 18px; - } - - span { - margin-left: 20px; - text-transform: capitalize; + margin-right: 20px; } } } diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index c065dd97552..c58aaf26398 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -5,8 +5,9 @@ - providers = enabled_button_based_providers - providers.each do |provider| - has_icon = provider_has_icon?(provider) - = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'btn omniauth-btn', id: "oauth-login-#{provider}" do - = provider_image_tag(provider) + = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'btn omniauth-btn oauth-login', id: "oauth-login-#{provider}" do + - if has_icon + = provider_image_tag(provider) %span = label_for_provider(provider) %fieldset.remember-me |