From 42c5d68d7fa187271d97c3a22194c3acce5d9ed6 Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Mon, 9 Sep 2024 17:57:31 +0100 Subject: [PATCH 1/7] Changed the H4 configurations --- styles/styles.css | 4 ++-- styles/tailwind.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/styles/styles.css b/styles/styles.css index e93bb717..e2968606 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -517,9 +517,9 @@ h3 { } h4 { - font-size: 1.25rem; + font-size: 1.125rem !important; font-weight: 500 !important; - line-height: 1.75rem; + line-height: 1.75rem !important; } h5 { diff --git a/styles/tailwind.css b/styles/tailwind.css index a8850bd3..018d7320 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -42,7 +42,7 @@ } h4 { - @apply leading-7 !font-medium text-xl; + @apply !leading-7 !font-medium !text-lg; } h5 { From 5634d81e1017370662b19d8ff45dc883ab5da7fc Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Tue, 10 Sep 2024 18:11:05 +0100 Subject: [PATCH 2/7] Updated styling on classes --- styles/styles.css | 29 +++++++++++++++++++++++++++++ styles/tailwind.css | 8 ++++++++ 2 files changed, 37 insertions(+) diff --git a/styles/styles.css b/styles/styles.css index e93bb717..3ddaa8fe 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -894,6 +894,35 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe margin-bottom: 1.25rem; } +.container-two-col .col-right a { + margin-top: 1.5rem; + border-radius: 9999px; + border-width: 1px; + --tw-border-opacity: 1; + border-color: rgb(117 35 255 / var(--tw-border-opacity)); + background-color: transparent; + padding-left: 1.25rem; + padding-right: 1.25rem; + padding-top: 0.75rem; + padding-bottom: 0.75rem; + font-size: 1.125rem; + font-weight: 500; + line-height: 1.25rem; + --tw-text-opacity: 1; + color: rgb(117 35 255 / var(--tw-text-opacity)); + text-decoration-line: none; + transition-property: all; + transition-duration: 150ms; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); +} + +.container-two-col .col-right 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)); +} + .container-two-col .col-right h2 { margin-bottom: 0.5rem; display: inline-flex; diff --git a/styles/tailwind.css b/styles/tailwind.css index a8850bd3..8263e0ae 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -158,6 +158,14 @@ @apply mb-5; } + .container-two-col .col-right a { + @apply bg-transparent no-underline text-lg px-5 py-3 text-danaherpurple-500 border border-danaherpurple-500 leading-5 rounded-full font-medium mt-6 ease-in-out duration-150 transition-all; + } + + .container-two-col .col-right a:hover { + @apply bg-danaherpurple-500 text-white; + } + .container-two-col .col-right h2 { @apply inline-flex mb-2 font-semibold !text-xl text-danahergray-900; } From 05cd598a59b22c0159d51db794e4b3653111e80c Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Mon, 16 Sep 2024 09:44:34 +0100 Subject: [PATCH 3/7] Updated to use hover styling. --- styles/styles.css | 19 ++++--------------- styles/tailwind.css | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/styles/styles.css b/styles/styles.css index 3ddaa8fe..d8898656 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -895,22 +895,11 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe } .container-two-col .col-right a { - margin-top: 1.5rem; - border-radius: 9999px; - border-width: 1px; - --tw-border-opacity: 1; - border-color: rgb(117 35 255 / var(--tw-border-opacity)); background-color: transparent; - padding-left: 1.25rem; - padding-right: 1.25rem; - padding-top: 0.75rem; - padding-bottom: 0.75rem; - font-size: 1.125rem; - font-weight: 500; - line-height: 1.25rem; - --tw-text-opacity: 1; - color: rgb(117 35 255 / var(--tw-text-opacity)); - text-decoration-line: none; + text-decoration-line: underline; + text-decoration-color: #7523FF; + text-decoration-thickness: 2px; + text-underline-offset: 4px; transition-property: all; transition-duration: 150ms; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); diff --git a/styles/tailwind.css b/styles/tailwind.css index 8263e0ae..d66372ec 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -159,7 +159,7 @@ } .container-two-col .col-right a { - @apply bg-transparent no-underline text-lg px-5 py-3 text-danaherpurple-500 border border-danaherpurple-500 leading-5 rounded-full font-medium mt-6 ease-in-out duration-150 transition-all; + @apply bg-transparent underline underline-offset-4 decoration-danaherpurple-500 decoration-2 ease-in-out duration-150 transition-all; } .container-two-col .col-right a:hover { From 1e52d5bf5822c3862c6baa92b6a22b86cd4a8fcb Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Wed, 25 Sep 2024 16:41:20 +0100 Subject: [PATCH 4/7] Updated code to ignore buttons and bullets --- styles/styles.css | 4 ++-- styles/tailwind.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/styles/styles.css b/styles/styles.css index cf326be2..0d50d673 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -894,7 +894,7 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe margin-bottom: 1.25rem; } -.container-two-col .col-right a { +.container-two-col .col-right a:not(.btn):not(.rounded-full) { background-color: transparent; text-decoration-line: underline; text-decoration-color: #7523FF; @@ -905,7 +905,7 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); } -.container-two-col .col-right a:hover { +.container-two-col .col-right a:not(.btn):not(.rounded-full ):hover { --tw-bg-opacity: 1; background-color: rgb(117 35 255 / var(--tw-bg-opacity)); --tw-text-opacity: 1; diff --git a/styles/tailwind.css b/styles/tailwind.css index c43c26fe..5718dd39 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -158,11 +158,11 @@ @apply mb-5; } - .container-two-col .col-right a { + .container-two-col .col-right a:not(.btn):not(.rounded-full) { @apply bg-transparent underline underline-offset-4 decoration-danaherpurple-500 decoration-2 ease-in-out duration-150 transition-all; } - .container-two-col .col-right a:hover { + .container-two-col .col-right a:not(.btn):not(.rounded-full ):hover { @apply bg-danaherpurple-500 text-white; } From 5b4a54f047e17d5efb1dcab3b1350f8f67101588 Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Wed, 25 Sep 2024 18:07:44 +0100 Subject: [PATCH 5/7] Added more not statements --- styles/styles.css | 4 ++-- styles/tailwind.css | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/styles/styles.css b/styles/styles.css index 0d50d673..6545c225 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -894,7 +894,7 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe margin-bottom: 1.25rem; } -.container-two-col .col-right a:not(.btn):not(.rounded-full) { +.container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600) { background-color: transparent; text-decoration-line: underline; text-decoration-color: #7523FF; @@ -905,7 +905,7 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); } -.container-two-col .col-right a:not(.btn):not(.rounded-full ):hover { +.container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600):hover { --tw-bg-opacity: 1; background-color: rgb(117 35 255 / var(--tw-bg-opacity)); --tw-text-opacity: 1; diff --git a/styles/tailwind.css b/styles/tailwind.css index 5718dd39..a235485e 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -157,12 +157,12 @@ .container-two-col .col-right p { @apply mb-5; } - - .container-two-col .col-right a:not(.btn):not(.rounded-full) { + + .container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600) { @apply bg-transparent underline underline-offset-4 decoration-danaherpurple-500 decoration-2 ease-in-out duration-150 transition-all; } - .container-two-col .col-right a:not(.btn):not(.rounded-full ):hover { + .container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600):hover { @apply bg-danaherpurple-500 text-white; } From ce64868017452d4925c3ea88ae80b117124ce865 Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Thu, 26 Sep 2024 10:00:45 +0100 Subject: [PATCH 6/7] Simplifying and fixing lint issues --- styles/styles.css | 4 ++-- styles/tailwind.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/styles/styles.css b/styles/styles.css index 6545c225..2422a978 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -894,7 +894,7 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe margin-bottom: 1.25rem; } -.container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600) { +.container-two-col .col-right a:not(.btn, .rounded-full, .carousel-slider, .text-danaherblue-600) { background-color: transparent; text-decoration-line: underline; text-decoration-color: #7523FF; @@ -905,7 +905,7 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); } -.container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600):hover { +.container-two-col .col-right a:not(.btn, .rounded-full, .carousel-slider, .text-danaherblue-600):hover { --tw-bg-opacity: 1; background-color: rgb(117 35 255 / var(--tw-bg-opacity)); --tw-text-opacity: 1; diff --git a/styles/tailwind.css b/styles/tailwind.css index a235485e..f200ccf3 100644 --- a/styles/tailwind.css +++ b/styles/tailwind.css @@ -158,11 +158,11 @@ @apply mb-5; } - .container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600) { + .container-two-col .col-right a:not(.btn, .rounded-full, .carousel-slider, .text-danaherblue-600) { @apply bg-transparent underline underline-offset-4 decoration-danaherpurple-500 decoration-2 ease-in-out duration-150 transition-all; } - .container-two-col .col-right a:not(.btn):not(.rounded-full):not(.carousel-slider):not(.text-danaherblue-600):hover { + .container-two-col .col-right a:not(.btn, .rounded-full, .carousel-slider, .text-danaherblue-600):hover { @apply bg-danaherpurple-500 text-white; } From 3290e1412f146497475185eac6e761f879a4050b Mon Sep 17 00:00:00 2001 From: Dave Nichols Date: Thu, 26 Sep 2024 11:52:13 +0100 Subject: [PATCH 7/7] Updated this code as this is conflicting. --- blocks/workflow-carousel/workflow-carousel.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blocks/workflow-carousel/workflow-carousel.css b/blocks/workflow-carousel/workflow-carousel.css index 7906a2a4..e40f6230 100644 --- a/blocks/workflow-carousel/workflow-carousel.css +++ b/blocks/workflow-carousel/workflow-carousel.css @@ -229,9 +229,9 @@ button, [type='submit'] { -webkit-appearance: button; /* 1 */ - background-color: transparent; + /* background-color: transparent; */ /* 2 */ - background-image: none; + /* background-image: none; */ /* 2 */ }