Merge branch '233660-remove-bootstrap-alert-gcp' into 'master'

Remove bootrap alert from gcp offer

See merge request gitlab-org/gitlab!41814

app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml

 - link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer')
-.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.gl-mt-3.gl-mb-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }
-  %button.close.js-close{ type: "button" }  ×
-  .gcp-signup-offer--content
-    .gcp-signup-offer--icon.gl-mr-3
-      = sprite_icon("information")
-    .gcp-signup-offer--copy
-      %h4= s_('ClusterIntegration|Did you know?')
-      %p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link }
-      %a.btn.btn-default{ href: 'https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form', target: '_blank', rel: 'noopener noreferrer' }
-        = s_("ClusterIntegration|Apply for credit")
+.gcp-signup-offer.gl-alert.gl-alert-info.gl-my-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }
+  %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
+    = sprite_icon('close', size: 16, css_class: 'gl-icon')
+  = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+  %h4.gl-alert-title= s_('ClusterIntegration|Did you know?')
+  %p.gl-alert-body= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link }
+  %a.gl-button.btn-info{ href: 'https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form', target: '_blank', rel: 'noopener noreferrer' }
+    = s_("ClusterIntegration|Apply for credit")

changelogs/unreleased/233660-remove-bootstrap-alert-gcp.yml

+---
+title: Remove bootrap alert from gcp offer
+merge_request: 41814
+author:
+type: other

spec/features/projects/clusters/gcp_spec.rb

@@ -192,7 +192,7 @@ RSpec.describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
     it 'user does not see offer after dismissing' do
       expect(page).to have_css('.gcp-signup-offer')
 
-      find('.gcp-signup-offer .close').click
+      find('.gcp-signup-offer .js-close').click
       wait_for_requests
 
       click_link 'Add Kubernetes cluster'