Skip to content

Commit

Permalink
Merge branch 'main' into 1266-salesforce-beacon
Browse files Browse the repository at this point in the history
  • Loading branch information
davenichols-DHLS authored Oct 17, 2024
2 parents 79640c8 + 78c82d4 commit c9762c4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
4 changes: 2 additions & 2 deletions blocks/workflow-carousel/workflow-carousel.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
}

Expand Down
22 changes: 20 additions & 2 deletions styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -894,6 +894,24 @@ main .section:not(.stretch, .product-hero-container, .workflow-carousel-containe
margin-bottom: 1.25rem;
}

.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;
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);
}

.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;
color: rgb(255 255 255 / var(--tw-text-opacity));
}

.container-two-col .col-right h2 {
margin-bottom: 0.5rem;
display: inline-flex;
Expand Down
10 changes: 9 additions & 1 deletion styles/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}

h4 {
@apply leading-7 !font-medium text-xl;
@apply !leading-7 !font-medium !text-lg;
}

h5 {
Expand Down Expand Up @@ -157,6 +157,14 @@
.container-two-col .col-right p {
@apply mb-5;
}

.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, .rounded-full, .carousel-slider, .text-danaherblue-600):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;
Expand Down

0 comments on commit c9762c4

Please sign in to comment.