diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css index d13b821b..389725aa 100644 --- a/blocks/columns/columns.css +++ b/blocks/columns/columns.css @@ -136,8 +136,8 @@ height: 100%; } -.columns-wrapper :is(.w-1\/2) { - width: 50%; +.columns-wrapper :is(.\!w-1\/2) { + width: 50% !important; } .columns-wrapper :is(.w-12) { diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js index 540b3ba7..6d6444be 100644 --- a/blocks/columns/columns.js +++ b/blocks/columns/columns.js @@ -154,7 +154,7 @@ export default function decorate(block) { const seventythirtyEl = picWrapper.parentElement ?.parentElement?.parentElement?.parentElement; if (seventythirtyEl.querySelector('img')) { - pic.querySelector('img').classList.add('block', 'w-1/2'); + pic.querySelector('img').classList.add('block', '!w-1/2'); } else { pic.querySelector('img').classList.add('block'); } diff --git a/blocks/mini-teasers/mini-teasers.js b/blocks/mini-teasers/mini-teasers.js index 3f05437f..83b945ec 100644 --- a/blocks/mini-teasers/mini-teasers.js +++ b/blocks/mini-teasers/mini-teasers.js @@ -25,6 +25,12 @@ export default function decorate(block) { link.classList.add(...'text-base font-semibold text-danaherpurple-500'.split(' ')); if (link.href.endsWith('#RequestAQuote')) link.classList.add('show-modal-btn'); } + const hrefLinks = element.querySelectorAll('a'); + hrefLinks.forEach((hrefLink) => { + if (hrefLink.href.includes('/null.html')) { + hrefLink.remove(); + } + }); }); if (block.classList.contains('add-border')) block.classList.add(...'border-t border-b border-solid border-black'.split(' ')); decorateModals(block); diff --git a/blocks/product-hero/product-hero.js b/blocks/product-hero/product-hero.js index c97dfa84..f049764b 100644 --- a/blocks/product-hero/product-hero.js +++ b/blocks/product-hero/product-hero.js @@ -179,6 +179,9 @@ export default async function decorate(block) { defaultContent.prepend(span({ class: 'categories hidden' }, response[0]?.raw.categories)); defaultContent.prepend(span({ class: 'category-name' }, response[0]?.raw?.defaultcategoryname ? response[0]?.raw?.defaultcategoryname : '')); const rfqEl = block.querySelector(':scope > div:nth-child(1)'); + console.log(rfqEl); + const addCartBtnEl = block.querySelector(':scope > div:nth-child(1)'); + addCartBtnEl.classList.add(...'btn-outline-trending-brand text-lg rounded-full px-4 py-2 !no-underline'.split(' ')); if (rfqEl && rfqEl.textContent.includes('Request for Quote')) { let rfqParent; rfqEl.classList.add(...'btn-outline-trending-brand text-lg rounded-full px-4 py-2 !no-underline'.split(' ')); @@ -194,6 +197,7 @@ export default async function decorate(block) { const infoDiv = div(); if (response[0]?.raw.externallink !== undefined) { infoDiv.prepend( + p('Test Message'), p('For additional information'), a( { href: `${response[0]?.raw.externallink}?utm_source=dhls_website`, target: '_blank' }, diff --git a/styles/styles.css b/styles/styles.css index f5a9cb2d..0d5ac505 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -2061,6 +2061,20 @@ main .section .talk-to-an-expert-form-wrapper .talk-to-an-expert-form > div ul { overflow-y: scroll; } +.carousel-container .btn-primary-purple { + border-width: 2px; +} + +@media (min-width: 1024px) { + .mini-teasers-container .default-content-wrapper h2 { + padding-top: 2rem; + } + + .columns-container p.link { + padding-top: 2rem; + } +} + .pointer-events-none { pointer-events: none; } diff --git a/styles/tailwind.css b/styles/tailwind.css index c8f6af0a..c33a5a3f 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -582,6 +582,18 @@ @apply overflow-y-scroll; } + .carousel-container .btn-primary-purple{ + @apply border-2; + } + + .mini-teasers-container .default-content-wrapper h2 { + @apply lg:pt-8; + } + + .columns-container p.link { + @apply lg:pt-8; + } + } @layer utilities {