From 390123f371e72bf1da84539046f37ff0005c7a7e Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Mon, 18 Dec 2023 11:11:09 +0100
Subject: [PATCH 01/12] Revert "Merge branch 'main' into main"

This reverts commit 6c3a61b92e4acd540219d74e0eb09e6d0456bd39, reversing
changes made to 3a146496975cb889186e99c130c2358dd0eb7c3a.
---
 .github/workflows/deploy-converter.yaml | 1 +
 converter.yaml                          | 2 +-
 fstab.yaml                              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-converter.yaml b/.github/workflows/deploy-converter.yaml
index f3d2037a8..fe6347a89 100644
--- a/.github/workflows/deploy-converter.yaml
+++ b/.github/workflows/deploy-converter.yaml
@@ -46,6 +46,7 @@ jobs:
           ${{ runner.os }}-build-
           ${{ runner.os }}-
     - run: npm ci
+    - run: npm run converter:test
     - run: npm run converter:build:prod
     - run: npm run converter:deploy -- convert/${ACTION_NAME}
       env:
diff --git a/converter.yaml b/converter.yaml
index 22c2a81eb..e7ac74b73 100644
--- a/converter.yaml
+++ b/converter.yaml
@@ -1,5 +1,5 @@
 # the origin to fetch content from
-origin: https://author-p93411-e849552.adobeaemcloud.com/
+origin: https://author-p93411-e849602.adobeaemcloud.com
 suffix: ".html?wcmmode=disabled"
 # the live urls of the content
 # this is used to make absolute links to the urls domain reliatve
diff --git a/fstab.yaml b/fstab.yaml
index 5d37cba87..b2b9b9a4a 100644
--- a/fstab.yaml
+++ b/fstab.yaml
@@ -1,5 +1,5 @@
 mountpoints:
   /:
-    url: https://1050314-569danaherxwalk.adobeioruntime.net/api/v1/web/convert/main/
+    url: https://1050314-569danaherxwalk-stage.adobeioruntime.net/api/v1/web/convert/main/
     type: markup
     suffix: ".html?wcmmode=disabled"

From 27988879b0ba14d673e0f3873d0e23f2335f5929 Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Mon, 18 Dec 2023 14:22:47 +0100
Subject: [PATCH 02/12] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9b50b418a..c90e73aa3 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@ feat-30-integrate-accessible
 
 The following options can be selected as the type: 
 
-Feat (new feature or enhancement) 
-Fix (bug fix) 
+- Feat (new feature or enhancement) 
+- Fix (bug fix) 
 
 The short issue name must not be more than 15 characters long. 
 

From b5be65a4f61328f8271968b836973e7c4e787428 Mon Sep 17 00:00:00 2001
From: wz914876 <sharanagouda_patil@pall.com>
Date: Mon, 18 Dec 2023 21:01:22 +0530
Subject: [PATCH 03/12] [Product OpCo] h4 not correctly styled in purple boxes

---
 blocks/columns/columns.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js
index 38720b0d2..5ffb3371e 100644
--- a/blocks/columns/columns.js
+++ b/blocks/columns/columns.js
@@ -24,7 +24,12 @@ export default function decorate(block) {
       } else if (!block.className.includes('itemscenter')) {
         row.classList.add('h-full');
       }
-
+      const hFour = row.querySelectorAll('h4');
+      if (hFour) {
+        [...hFour].forEach((item) => {
+          item.classList.add(...'font-normal text-base text-white pb-4 px-6 mt-2'.split(' '));
+        });
+      }
       const anc = row.querySelectorAll('p > a');
       if (anc) {
         [...anc].forEach((item) => {

From 2eef9ffa49bd5b8f716d7db951d5eaa22680cac1 Mon Sep 17 00:00:00 2001
From: wz914876 <sharanagouda_patil@pall.com>
Date: Mon, 18 Dec 2023 21:55:14 +0530
Subject: [PATCH 04/12] applied changes to css

---
 blocks/columns/columns.css | 2 +-
 blocks/columns/columns.js  | 7 +------
 styles/styles.css          | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css
index 25fbc2254..a43cccada 100644
--- a/blocks/columns/columns.css
+++ b/blocks/columns/columns.css
@@ -62,7 +62,7 @@ main .top-border > div.columns-wrapper:first-child {
   @apply py-2 px-6 leading-7 text-base !text-white;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > h2 {
+.columns.bg-color-right > div > div:nth-child(2) > h2, .columns.bg-color-right > div > div:nth-child(2) > h4 {
   @apply py-2 px-6 !text-white;
 }
 
diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js
index 5ffb3371e..38720b0d2 100644
--- a/blocks/columns/columns.js
+++ b/blocks/columns/columns.js
@@ -24,12 +24,7 @@ export default function decorate(block) {
       } else if (!block.className.includes('itemscenter')) {
         row.classList.add('h-full');
       }
-      const hFour = row.querySelectorAll('h4');
-      if (hFour) {
-        [...hFour].forEach((item) => {
-          item.classList.add(...'font-normal text-base text-white pb-4 px-6 mt-2'.split(' '));
-        });
-      }
+
       const anc = row.querySelectorAll('p > a');
       if (anc) {
         [...anc].forEach((item) => {
diff --git a/styles/styles.css b/styles/styles.css
index e5e7d4759..880574f8c 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -1034,7 +1034,7 @@ main .top-border > div.columns-wrapper:first-child {
     color: rgb(255 255 255 / var(--tw-text-opacity)) !important;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > h2 {
+.columns.bg-color-right > div > div:nth-child(2) > h2, .columns.bg-color-right > div > div:nth-child(2) > h4 {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
     padding-left: 1.5rem;

From f175b40ee347935c7ed45e7a6f5c41a529a81fba Mon Sep 17 00:00:00 2001
From: Dave Nichols <dave_nichols@europe.pall.com>
Date: Mon, 18 Dec 2023 16:32:04 +0000
Subject: [PATCH 05/12] Updated the Carousel timing

---
 blocks/carousel/carousel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocks/carousel/carousel.js b/blocks/carousel/carousel.js
index 7ec45584d..ae7bdb782 100644
--- a/blocks/carousel/carousel.js
+++ b/blocks/carousel/carousel.js
@@ -208,7 +208,7 @@ function Carousel(carouselEl, items, options) {
   init();
 }
 
-const SLIDE_DELAY = 5000;
+const SLIDE_DELAY = 7000;
 const SLIDE_TRANSITION = 1000;
 
 function configureNavigation(elementControls) {

From 25b2a8337c9f92a0c1254771155c910f55afbdad Mon Sep 17 00:00:00 2001
From: rgravitvl <ravitvl83@gmail.com>
Date: Tue, 19 Dec 2023 11:26:32 +0530
Subject: [PATCH 06/12] updated column css for bg-color-right

---
 blocks/columns/columns.css | 4 ++--
 blocks/columns/columns.js  | 2 +-
 styles/styles.css          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css
index 25fbc2254..b44d4f162 100644
--- a/blocks/columns/columns.css
+++ b/blocks/columns/columns.css
@@ -38,7 +38,7 @@
   @apply block;
 }
 
-.columns.bottom-border-right > div > div > p:nth-child(3n+3) {
+.columns.bottom-border-right > div > div > p.link {
   @apply border-b border-solid border-black my-6;
 }
 
@@ -50,7 +50,7 @@ main .top-border > div.columns-wrapper:first-child {
   @apply !py-0;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > p > a {
+.columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {
   @apply btn-outline-trending-brand text-lg rounded-full px-6 py-3 !no-underline;
 }
 
diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js
index 38720b0d2..291ce826f 100644
--- a/blocks/columns/columns.js
+++ b/blocks/columns/columns.js
@@ -29,7 +29,7 @@ export default function decorate(block) {
       if (anc) {
         [...anc].forEach((item) => {
           if (item.title === 'link') {
-            item.parentElement.classList.add('pb-8');
+            item.parentElement.classList.add(...'link pb-8'.split(' '));
             item.textContent += ' ->';
             item.classList.add(...'text-sm font-bold text-danaherpurple-500'.split(' '));
           }
diff --git a/styles/styles.css b/styles/styles.css
index e5e7d4759..a7fd9f886 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -971,7 +971,7 @@
     gap: 0.75rem;
 }
 
-.columns.bottom-border-right > div > div > p:nth-child(3n+3) {
+.columns.bottom-border-right > div > div > p.link {
     margin-top: 1.5rem;
     margin-bottom: 1.5rem;
     border-bottom-width: 1px;
@@ -989,7 +989,7 @@ main .top-border > div.columns-wrapper:first-child {
     padding-bottom: 0px !important;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > p > a {
+.columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {
     border-width: 2px;
     --tw-border-opacity: 1;
     border-color: rgb(117 35 255 / var(--tw-border-opacity));
@@ -999,14 +999,14 @@ main .top-border > div.columns-wrapper:first-child {
     color: rgb(117 35 255 / var(--tw-text-opacity));
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > p > a:hover {
+.columns.bg-color-right > div > div:nth-child(2) > p:last-child > a:hover {
     --tw-bg-opacity: 1;
     background-color: rgb(117 35 255 / var(--tw-bg-opacity));
     --tw-text-opacity: 1;
     color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > p > a {
+.columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {
     border-radius: 9999px;
     padding-left: 1.5rem;
     padding-right: 1.5rem;

From 26e887d92ee7f0d961240bf2cef4c8d86434a39e Mon Sep 17 00:00:00 2001
From: rgravitvl <ravitvl83@gmail.com>
Date: Tue, 19 Dec 2023 11:54:06 +0530
Subject: [PATCH 07/12] added underline for link

---
 blocks/columns/columns.css | 4 ++++
 styles/styles.css          | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css
index b44d4f162..0e18cde65 100644
--- a/blocks/columns/columns.css
+++ b/blocks/columns/columns.css
@@ -50,6 +50,10 @@ main .top-border > div.columns-wrapper:first-child {
   @apply !py-0;
 }
 
+.columns.bg-color-right > div > div:nth-child(2) > p > a {
+  @apply underline decoration-danaherlightblue-500 decoration-[3px];
+}
+
 .columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {
   @apply btn-outline-trending-brand text-lg rounded-full px-6 py-3 !no-underline;
 }
diff --git a/styles/styles.css b/styles/styles.css
index a7fd9f886..93575e81f 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -989,6 +989,12 @@ main .top-border > div.columns-wrapper:first-child {
     padding-bottom: 0px !important;
 }
 
+.columns.bg-color-right > div > div:nth-child(2) > p > a {
+    text-decoration-line: underline;
+    text-decoration-color: #3BC7E5;
+    text-decoration-thickness: 3px;
+}
+
 .columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {
     border-width: 2px;
     --tw-border-opacity: 1;

From ede8b73a0ad0acb722ad3146215aabe4226ac28e Mon Sep 17 00:00:00 2001
From: rgravitvl <ravitvl83@gmail.com>
Date: Tue, 19 Dec 2023 12:19:16 +0530
Subject: [PATCH 08/12] added border with hover

---
 blocks/columns/columns.css |  4 ++--
 styles/styles.css          | 27 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css
index 0e18cde65..e054721e3 100644
--- a/blocks/columns/columns.css
+++ b/blocks/columns/columns.css
@@ -50,8 +50,8 @@ main .top-border > div.columns-wrapper:first-child {
   @apply !py-0;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > p > a {
-  @apply underline decoration-danaherlightblue-500 decoration-[3px];
+.columns.bg-color-right > div > div:nth-child(2) > p {
+  @apply href-text;
 }
 
 .columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {
diff --git a/styles/styles.css b/styles/styles.css
index 93575e81f..59b16196e 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -989,10 +989,33 @@ main .top-border > div.columns-wrapper:first-child {
     padding-bottom: 0px !important;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > p > a {
+.columns.bg-color-right > div > div:nth-child(2) > p a {
+    position: relative;
+    z-index: 0;
+    word-break: break-all;
     text-decoration-line: underline;
-    text-decoration-color: #3BC7E5;
+    text-decoration-color: #3bc7e5;
     text-decoration-thickness: 3px;
+    transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
+    transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+    transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
+    transition-duration: 700ms;
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.columns.bg-color-right > div > div:nth-child(2) > p a:hover {
+    --tw-bg-opacity: 1;
+    background-color: rgb(59 199 229 / var(--tw-bg-opacity));
+    --tw-text-opacity: 1;
+    color: rgb(255 255 255 / var(--tw-text-opacity));
+}
+
+@media (min-width: 768px) {
+
+    .columns.bg-color-right > div > div:nth-child(2) > p a {
+        overflow-wrap: normal;
+        word-break: normal;
+    }
 }
 
 .columns.bg-color-right > div > div:nth-child(2) > p:last-child > a {

From 64480658922903014c3671190414e8b5a1132c9f Mon Sep 17 00:00:00 2001
From: wz914876 <sharanagouda_patil@pall.com>
Date: Tue, 19 Dec 2023 12:25:23 +0530
Subject: [PATCH 09/12] added for h3 tags as well

---
 blocks/columns/columns.css | 4 +++-
 styles/styles.css          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css
index a43cccada..16801719e 100644
--- a/blocks/columns/columns.css
+++ b/blocks/columns/columns.css
@@ -62,7 +62,9 @@ main .top-border > div.columns-wrapper:first-child {
   @apply py-2 px-6 leading-7 text-base !text-white;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > h2, .columns.bg-color-right > div > div:nth-child(2) > h4 {
+.columns.bg-color-right > div > div:nth-child(2) > h2,
+.columns.bg-color-right > div > div:nth-child(2) > h3, 
+.columns.bg-color-right > div > div:nth-child(2) > h4 {
   @apply py-2 px-6 !text-white;
 }
 
diff --git a/styles/styles.css b/styles/styles.css
index 880574f8c..5d6519dd3 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -1034,7 +1034,9 @@ main .top-border > div.columns-wrapper:first-child {
     color: rgb(255 255 255 / var(--tw-text-opacity)) !important;
 }
 
-.columns.bg-color-right > div > div:nth-child(2) > h2, .columns.bg-color-right > div > div:nth-child(2) > h4 {
+.columns.bg-color-right > div > div:nth-child(2) > h2,
+.columns.bg-color-right > div > div:nth-child(2) > h3, 
+.columns.bg-color-right > div > div:nth-child(2) > h4 {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
     padding-left: 1.5rem;

From 00be9a5700f4fd1afce7ffb8d99fd3027ba9344a Mon Sep 17 00:00:00 2001
From: Ravi R <ravitvl83@gmail.com>
Date: Tue, 19 Dec 2023 14:18:46 +0530
Subject: [PATCH 10/12] Update blocks/columns/columns.js

Co-authored-by: Markus Haack <mhaack@adobe.com>
---
 blocks/columns/columns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js
index 291ce826f..ce57b47d8 100644
--- a/blocks/columns/columns.js
+++ b/blocks/columns/columns.js
@@ -29,7 +29,7 @@ export default function decorate(block) {
       if (anc) {
         [...anc].forEach((item) => {
           if (item.title === 'link') {
-            item.parentElement.classList.add(...'link pb-8'.split(' '));
+            item.parentElement.classList.add('link', 'pb-8');
             item.textContent += ' ->';
             item.classList.add(...'text-sm font-bold text-danaherpurple-500'.split(' '));
           }

From 310651a55e5c2888fdaca5cbe02b351023f83b54 Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Tue, 19 Dec 2023 15:34:30 +0100
Subject: [PATCH 11/12] chore: increase sample rate

---
 scripts/lib-franklin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib-franklin.js b/scripts/lib-franklin.js
index 4d726fbe7..fa68816e5 100644
--- a/scripts/lib-franklin.js
+++ b/scripts/lib-franklin.js
@@ -41,7 +41,7 @@ export function sampleRUM(checkpoint, data = {}) {
     window.hlx = window.hlx || {};
     if (!window.hlx.rum) {
       const usp = new URLSearchParams(window.location.search);
-      const weight = usp.get('rum') === 'on' ? 1 : 100; // with parameter, weight is 1. Defaults to 100.
+      const weight = usp.get('rum') === 'on' ? 1 : 20; // with parameter, weight is 1. Defaults to 100.
       const id = Array.from({ length: 75 }, (_, i) => String.fromCharCode(48 + i))
         .filter((a) => /\d|[A-Z]/i.test(a))
         .filter(() => Math.random() * 75 > 70)

From 75e874ef6cb7b4fc5ae58281835bb8a1e7fc89f4 Mon Sep 17 00:00:00 2001
From: Duy Nguyen <duy.phnguyen@gmail.com>
Date: Tue, 19 Dec 2023 16:14:45 +0100
Subject: [PATCH 12/12] fix: carousel not working on Firefox

---
 blocks/carousel/carousel.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/blocks/carousel/carousel.js b/blocks/carousel/carousel.js
index ae7bdb782..0896bb9c2 100644
--- a/blocks/carousel/carousel.js
+++ b/blocks/carousel/carousel.js
@@ -258,15 +258,15 @@ export default function decorate(block) {
       const content = contentEl.closest('div');
       content.classList.add(...'lg:w-1/2 px-4 lg:px-8 xl:pr-10 pb-10 pt-6 md:pt-4 lg:py-20'.split(' '));
       const heading = content.querySelector('h2');
-      const paragraphs = content.querySelectorAll('p:not(.button-container):not(:has(a[title="link"]))');
+      const paragraphs = content.querySelectorAll('p:not(.button-container)');
       const allBtns = content.querySelectorAll('p.button-container .btn, a[title="link"]');
       if (heading) heading.classList.add(...'text-2xl md:text-4xl tracking-wide md:tracking-tight m-0 font-medium md:font-normal leading-8 md:leading-[55px]'.split(' '));
-      if (paragraphs.length > 0) {
-        paragraphs.forEach((paragraph) => {
+      paragraphs.forEach((paragraph) => {
+        if (!paragraph.querySelector('a[title="link"]')) {
           if (paragraph.nextElementSibling && ['H1', 'H2', 'H3'].includes(paragraph.nextElementSibling.nodeName)) paragraph.classList.add(...'text-danaherpurple-500'.split(' '));
           else paragraph.classList.add(...'text-xl font-extralight tracking-tight leading-7 mt-6'.split(' '));
-        });
-      }
+        }
+      });
       if (allBtns.length > 0) {
         const actions = div({ class: 'flex flex-col md:flex-row gap-5 mt-10' });
         allBtns.forEach((elBtn) => {