Sync main branch from pricefx-eds-qa, excluding fstab.yaml

pricefx · Jun 13, 2024 · 8624e8a · 8624e8a
2 parents 2af1599 + 45c8ecf
commit 8624e8a
Show file tree

Hide file tree

Showing 6 changed files with 235 additions and 200 deletions.
diff --git a/blocks/carousel/carousel.css b/blocks/carousel/carousel.css
@@ -159,6 +159,15 @@ main .carousel:has(.carousel[data-carousel-type='carousel-quote']) .carousel > p
   padding: 0 60px 0 0;
 }
 
+.carousel[data-carousel-type='carousel-image'] .carousel-slide .columns .columns-img-col p,
+.carousel[data-carousel-type='carousel-image'] .carousel-slide .columns .columns-img-col a,
+.carousel[data-carousel-type='carousel-image'] .carousel-slide .columns .columns-img-col picture {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  width: 100%;
+}
+
 .carousel[data-carousel-type='carousel-image'] .carousel-slide .columns .columns-img-col:last-child {
   border: none;
   margin: 0;
@@ -171,7 +180,9 @@ main .carousel:has(.carousel[data-carousel-type='carousel-quote']) .carousel > p
 
 .carousel[data-carousel-type='carousel-image'] .carousel-slide img {
   display: block;
+  height: 100%;
   max-width: 200px;
+  object-fit: contain;
   width: 100%;
 }
 

diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js
@@ -50,7 +50,11 @@ export default function decorate(block) {
 
           if (environmentMode() === 'publish') {
             linkwrapper.remove();
-            if (!isTarget.classList.contains('button-container')) {
+            if (isTarget === null) {
+              return;
+            }
+
+            if (!isTarget.querySelector('.download-btn')) {
               isTarget.remove();
             }
           }

diff --git a/blocks/hero/hero.js b/blocks/hero/hero.js
@@ -4,7 +4,7 @@ import { environmentMode, replaceBasePath } from '../../scripts/global-functions
 import { BASE_CONTENT_PATH } from '../../scripts/url-constants.js';
 
 function decorateButton(heroLeftContainer) {
-  heroLeftContainer.querySelectorAll('.button-container').forEach((btn) => {
+  heroLeftContainer.querySelectorAll('div.button-container').forEach((btn) => {
     const btnStyle = btn.children[0]?.textContent || 'primary';
     const btnLink = btn.children[1]?.textContent;
     const btnLabel = btn.children[2]?.textContent;

diff --git a/blocks/marketo-form/marketo-form.css b/blocks/marketo-form/marketo-form.css
@@ -46,6 +46,24 @@
   flex-direction: column;
 }
 
+.marketo-form-wrapper .mktoForm .mktoFieldWrap:has(.mktoCheckboxList) {
+  align-items: center;
+  flex-direction: row;
+}
+
+.marketo-form-wrapper .mktoForm .mktoFieldWrap:has(.mktoCheckboxList) label {
+  order: 2;
+}
+
+.marketo-form-wrapper .mktoForm .mktoFieldWrap:has(.mktoCheckboxList) .mktoGutter {
+  height: 8px;
+  order: 3;
+}
+
+.marketo-form-wrapper .mktoForm .mktoFieldWrap:has(.mktoCheckboxList) label br {
+  display: none;
+}
+
 .marketo-form-wrapper .mktoForm .mktoGutter {
   height: var(--spacing-micro);
 }
@@ -112,10 +130,6 @@
   width: auto !important;
 }
 
-.marketo-form-wrapper .mktoForm .mktoFieldWrap:has(.mktoCheckboxList) .mktoGutter {
-  height: 8px;
-}
-
 .marketo-form-wrapper .mktoForm .mktoCheckboxList input[type='checkbox'] {
   appearance: none;
   background: #fafbfc;
@@ -271,6 +285,12 @@
   color: rgba(53 53 53 / 80%);
 }
 
+.marketo-form-wrapper .marketo-form h2.form-title {
+  background: var(--c-dark-blue-gradient);
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
 /* RESPONSIVE STYLES */
 @media (width <= 767px) {
   .form-two-columns {