Merge branch 'main' into issue-964-long-urls-wrap

hlxsites · Aug 2, 2024 · d87108f · d87108f
2 parents 41c30b5 + 43de6bd
commit d87108f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 20 deletions.
diff --git a/blocks/leadspace/leadspace.css b/blocks/leadspace/leadspace.css
@@ -1,5 +1,5 @@
 /* Leadspace block styles */
-.leadspace, 
+.leadspace,
 .leadspace p {
   font-family: var(--sans-serif-font-light);
   font-size: var(--font-size-16);
@@ -217,7 +217,6 @@ main div.leadspace-wrapper {
 
 .leadspace.brand-logo .button-group .button-container a {
   font-weight: var(--font-weight-regular);
-  height: var(--spacer-element-10);
 }
 
 .leadspace.brand-logo .button-group .button-container:nth-child(3){
@@ -551,7 +550,7 @@ main div.leadspace-wrapper {
   .home-video.leadspace-container .leadspace-wrapper {
     padding-top: 0;
   }
-  
+
   .leadspace.video > div:first-child {
     align-items: flex-start;
   }
@@ -565,7 +564,7 @@ main div.leadspace-wrapper {
   }
 
   .leadspace.brand-logo .button-group .button-container:nth-child(3){
-    margin-left: var(--spacer-element-05);
+    /* margin-left: var(--spacer-element-05); */
     margin-top: unset;
   }
 
@@ -610,7 +609,7 @@ main div.leadspace-wrapper {
   .leadspace.half-circle > div > div:nth-child(2) picture {
     margin-top: var(--spacer-layout-06);
   }
-  
+
   /* Leadspace - Video */
   .leadspace.video > div:first-child > div:nth-child(2) {
     width: 45%;
@@ -624,7 +623,7 @@ main div.leadspace-wrapper {
 
   .leadspace .button-group {
     display: flex;
-    flex-flow: row nowrap;
+    flex-flow: row wrap;
     align-items: baseline;
   }
 
@@ -638,7 +637,7 @@ main div.leadspace-wrapper {
   }
 
   .leadspace.brand-logo .button-group .button-container a.tertiary {
-    margin-left: var(--spacer-element-05);
+    /* margin-left: var(--spacer-element-05); */
   }
 
   .leadspace.video .video-wrapper {

diff --git a/blocks/marketo/marketo.js b/blocks/marketo/marketo.js
@@ -27,22 +27,43 @@ const embedMarketoForm = (marketoId, formId, successUrl) => {
       if (successUrl) {
         window.MktoForms2.loadForm('//go.merative.com', `${marketoId}`, formId, (form) => {
           // Add an onSuccess handler
-          // eslint-disable-next-line no-unused-vars
-          form.onSuccess((values, followUpUrl) => {
-            // Take the lead to a different page on successful submit,
-            // ignoring the form's configured followUpUrl
-            // location.href = successUrl;
+          form.onSuccess(() => {
+            location.href = successUrl;
             if (window._satellite) {
               _satellite.track('formSubmit', {
                 formName: document.title,
               });
             }
-            // Drift popup custom code
-            drift.api.collectFormData(values, {
-              campaignId: 2787244,
-              // followupUrl: 'https://www.merative.com/thank-you',
-              followupUrl: successUrl,
-            });
+            // Drift API call to commit form data immediately upon form submit
+            // if (typeof drift !== 'undefined') {
+            //   drift.on('ready', (api) => {
+            //     try {
+            //       api.commitFormData({
+            //         campaignId: 2787244,
+            //       });
+
+            //       if (location.href.includes('/contact')) {
+            //         // Drift popup custom code
+            //         drift.api.collectFormData(values, {
+            //           campaignId: 2787244,
+            //           followupUrl: successUrl,
+            //           stageData: true,
+            //         });
+            //       }
+
+            //       // Adobe Launch tracking for form submission
+            //       if (window._satellite) {
+            //         _satellite.track('formSubmit', {
+            //           formName: document.title,
+            //         });
+            //       }
+            //     } catch (error) {
+            //       // console.error('Error with Drift API calls:', error);
+            //     }
+            //   });
+            // } else {
+            //   // console.error('Drift is not defined');
+            // }
             // Return false to prevent the submission handler continuing with its own processing
             return false;
           });

diff --git a/blocks/solution-header/solution-header.css b/blocks/solution-header/solution-header.css
@@ -418,7 +418,7 @@
     flex-shrink: 0;
     gap: var(--spacer-layout-04);
     padding-top: 0;
-    padding-bottom: var(--spacer-element-08);
+    padding-bottom: 0;
   }
 
   .solution-header ul {

diff --git a/styles/styles.css b/styles/styles.css
@@ -928,7 +928,7 @@ button {
 }
 
 .button-container a.has-icon {
-  border-bottom: 0 !important;
+  /* border-bottom: 0 !important; */
 }
 
 .button-container a.has-icon.primary,