Merge branch...

Merge branch '273292-fy21q4-foundations-kr2-audit-and-update-buttons-on-sessionscontroller-new' into 'master'

Audit and update buttons on SessionsController#new

See merge request gitlab-org/gitlab!53254

app/assets/stylesheets/framework/variables.scss

@@ -443,7 +443,7 @@ $gl-avatar-size: 40px;
 $border-radius-default: 4px;
 $border-radius-small: 2px;
 $border-radius-large: 8px;
-$default-icon-size: 18px;
+$default-icon-size: 16px;
 $layout-link-gray: #7e7c7c;
 $btn-side-margin: 10px;
 $btn-sm-side-margin: 7px;

app/assets/stylesheets/page_bundles/signup.scss

@@ -32,11 +32,6 @@
     @include media-breakpoint-down(md) {
       width: 100%;
     }
-
-    img {
-      width: $default-icon-size;
-      height: $default-icon-size;
-    }
   }
 
   .decline-page {

app/assets/stylesheets/pages/login.scss

@@ -106,17 +106,6 @@
         width: 100%;
       }
     }
-
-    .omniauth-btn {
-      width: 100%;
-      padding: $gl-padding-8;
-
-      img {
-        width: $default-icon-size;
-        height: $default-icon-size;
-        margin-right: $gl-padding;
-      }
-    }
   }
 
   .new-session-tabs {

app/assets/stylesheets/startup/startup-signin.scss

@@ -2142,11 +2142,6 @@ table.code {
   width: 100%;
   padding: 8px;
 }
-.login-page .omniauth-container .omniauth-btn img {
-  width: 1.125rem;
-  height: 1.125rem;
-  margin-right: 16px;
-}
 .login-page .new-session-tabs {
   display: flex;
   box-shadow: 0 0 0 1px #dbdbdb;

app/helpers/auth_helper.rb

@@ -138,11 +138,11 @@ module AuthHelper
     label = label_for_provider(provider)
 
     if provider_has_custom_icon?(provider)
-      image_tag(icon_for_provider(provider), alt: label, title: "Sign in with #{label}")
+      image_tag(icon_for_provider(provider), alt: label, title: "Sign in with #{label}", class: "gl-button-icon")
     elsif provider_has_builtin_icon?(provider)
       file_name = "#{provider.to_s.split('_').first}_#{size}.png"
 
-      image_tag("auth_buttons/#{file_name}", alt: label, title: "Sign in with #{label}")
+      image_tag("auth_buttons/#{file_name}", alt: label, title: "Sign in with #{label}", class: "gl-button-icon")
     else
       label
     end

app/views/devise/sessions/_new_base.html.haml

@@ -20,4 +20,4 @@
       = recaptcha_tags
 
   .submit-container.move-submit-down
-    = f.submit _('Sign in'), class: 'gl-button btn btn-success', data: { qa_selector: 'sign_in_button' }
+    = f.submit _('Sign in'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'sign_in_button' }

app/views/devise/shared/_omniauth_box.html.haml

@@ -7,7 +7,7 @@
   .d-flex.justify-content-between.flex-wrap
     - 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 d-flex align-items-center omniauth-btn text-left oauth-login #{qa_class_for_provider(provider)}" do
+      = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn gl-button btn-default omniauth-btn oauth-login #{qa_class_for_provider(provider)}" do
         - if has_icon
           = provider_image_tag(provider)
         %span

changelogs/unreleased/273292-fy21q4-foundations-kr2-audit-and-update-buttons-on-sessionscontrol.yml

+---
+title: Update the Sign In button to use the new confirm button variant, migrate OAuth
+  buttons to use the default variant of GlButton.
+merge_request: 53254
+author:
+type: other