Merge branch 'sy-fix-banner-broadcast-message-subscription' into 'master'

Fix broadcast message on subscriptions page

See merge request gitlab-org/gitlab!82183

ee/app/assets/javascripts/subscriptions/new/components/app.vue

@@ -16,14 +16,14 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-h-full">
+  <div>
     <gitlab-experiment name="cart_abandonment_modal">
       <template #candidate>
         <modal />
       </template>
     </gitlab-experiment>
 
-    <step-order-app class="gl-h-full">
+    <step-order-app>
       <template #checkout>
         <checkout />
       </template>

ee/app/views/layouts/checkout.html.haml

 !!! 5
 %html.subscriptions-layout-html{ lang: 'en' }
   = render 'layouts/head'
-  %body.ui-indigo.d-flex.vh-100{ data: body_data }
+  %body.ui-indigo.gl-display-flex{ data: body_data }
     = render "layouts/header/logo_with_title"
-    = render "layouts/broadcast"
-    .container.d-flex.gl-flex-direction-column.m-0
-      = yield
+    .container.gl-display-flex.gl-flex-direction-column.gl-m-0.gl-px-0
+      = render "layouts/broadcast"
+      .gl-px-5
+        = yield

ee/spec/frontend/subscriptions/new/components/__snapshots__/app_spec.js.snap

 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`App component cart_abandonment_modal experiment candidate matches the snapshot 1`] = `
-<div
-  class="gl-h-full"
->
+<div>
   <gl-modal-stub
     dismisslabel="Close"
     modalclass=""
@@ -18,20 +16,14 @@ exports[`App component cart_abandonment_modal experiment candidate matches the s
   
   </gl-modal-stub>
    
-  <step-order-app-stub
-    class="gl-h-full"
-  />
+  <step-order-app-stub />
 </div>
 `;
 
 exports[`App component cart_abandonment_modal experiment control matches the snapshot 1`] = `
-<div
-  class="gl-h-full"
->
+<div>
   <!---->
    
-  <step-order-app-stub
-    class="gl-h-full"
-  />
+  <step-order-app-stub />
 </div>
 `;