diff --git a/jh/app/views/devise/shared/_omniauth_box.html.haml b/jh/app/views/devise/shared/_omniauth_box.html.haml index 3f3c37670f5a35f46fae2ffc4f92358e2d346a2f..f5be648d768b0737544d7e025db4965de738d1ef 100644 --- a/jh/app/views/devise/shared/_omniauth_box.html.haml +++ b/jh/app/views/devise/shared/_omniauth_box.html.haml @@ -9,7 +9,7 @@ .gl-display-flex.gl-flex-wrap{ class: restyle_login_page_enabled ? "#{single_provider ? 'gl-justify-content-center' : 'gl-justify-content-center gl-gap-3'}" : 'gl-justify-content-between' } - providers.each do |provider| - has_icon = provider_has_icon?(provider) - = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn gl-button btn-default gl-w-full gl-mb-2 js-oauth-login #{qa_class_for_provider(provider)} #{'gl-w-full gl-ml-2 gl-mr-2' unless restyle_login_page_enabled}", form: { class: restyle_login_page_enabled ? "gl-mb-3 #{single_provider ? 'gl-w-half' : 'gl-w-full'}" : 'gl-w-full gl-mb-3' } do + = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn gl-button btn-default gl-w-full gl-mb-2 js-oauth-login #{qa_selector_for_provider(provider)} #{'gl-w-full gl-ml-2 gl-mr-2' unless restyle_login_page_enabled}", form: { class: restyle_login_page_enabled ? "gl-mb-3 #{single_provider ? 'gl-w-half' : 'gl-w-full'}" : 'gl-w-full gl-mb-3' } do - if has_icon = provider_image_tag(provider) %span.gl-button-text diff --git a/jh/app/views/devise/shared/_signup_omniauth_provider_list.haml b/jh/app/views/devise/shared/_signup_omniauth_provider_list.haml index 3e7aaa22ce6f616df8d2961227a17a939f4ed935..ab754efb2d0b5b91df6ae706bb2a8906d60ea6f6 100644 --- a/jh/app/views/devise/shared/_signup_omniauth_provider_list.haml +++ b/jh/app/views/devise/shared/_signup_omniauth_provider_list.haml @@ -6,7 +6,7 @@ - single_provider = providers.length == 1 .gl-display-flex.gl-flex-wrap{ class: single_provider ? 'gl-justify-content-center' : 'gl-justify-content-center gl-gap-3' } - providers.each do |provider| - = link_to omniauth_authorize_path(:user, provider, register_omniauth_params), method: :post, class: "btn gl-button btn-default gl-mb-2 js-oauth-login #{single_provider ? 'gl-w-half gl-mx-2' : 'gl-w-full'} #{qa_class_for_provider(provider)}", data: { provider: provider }, id: "oauth-login-#{provider}" do + = link_to omniauth_authorize_path(:user, provider, register_omniauth_params), method: :post, class: "btn gl-button btn-default gl-mb-2 js-oauth-login #{single_provider ? 'gl-w-half gl-mx-2' : 'gl-w-full'} #{qa_selector_for_provider(provider)}", data: { provider: provider }, id: "oauth-login-#{provider}" do - if provider_has_icon?(provider) = provider_image_tag(provider) %span.gl-button-text @@ -16,7 +16,7 @@ = _("Create an account using:") .gl-display-flex.gl-justify-content-between.gl-flex-wrap - providers.each do |provider| - = link_to omniauth_authorize_path(:user, provider, register_omniauth_params), method: :post, class: "btn gl-button btn-default gl-w-full gl-mb-3 js-oauth-login #{qa_class_for_provider(provider)}", data: { provider: provider }, id: "oauth-login-#{provider}" do + = link_to omniauth_authorize_path(:user, provider, register_omniauth_params), method: :post, class: "btn gl-button btn-default gl-w-full gl-mb-3 js-oauth-login #{qa_selector_for_provider(provider)}", data: { provider: provider }, id: "oauth-login-#{provider}" do - if provider_has_icon?(provider) = provider_image_tag(provider) %span.gl-button-text