Merge branch 'hlxsites:main' into main

hlxsites · Nov 6, 2023 · e24fb31 · e24fb31
2 parents a371910 + c82d3a1
commit e24fb31
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 36 deletions.
diff --git a/blocks/card-list/card-list.js b/blocks/card-list/card-list.js
@@ -16,11 +16,11 @@ export function createCard(article, firstCard = false) {
     { href: makePublicUrl(article.path), title: article.title },
     imageHelper(article.image, article.title, firstCard),
     p(
-      { class: 'px-6 py-1 pt-4 text-sm text-danaherpurple-500' },
+      { class: 'cards !px-6 !py-1 !pt-4 !text-sm !text-danaherpurple-500' },
       article.brand || 'Danaher Corporation',
     ),
     p(
-      { class: 'px-6 pb-3 text-gray-500 text-sm' },
+      { class: '!px-6 !pb-3 !text-gray-500 !text-sm' },
       time(
         { datetime: formatDateUTCSeconds(article.publishDate) },
         formatDateUTCSeconds(article.publishDate, { month: 'long' }),
@@ -29,7 +29,7 @@ export function createCard(article, firstCard = false) {
     ),
     h2(
       {
-        class: 'px-6 text-lg font-semibold text-danahergray-900 mb-4 line-clamp-3 h-20 break-words',
+        class: '!px-6 !text-lg !font-semibold !text-danahergray-900 !mb-4 !line-clamp-3 !h-20 !break-words',
       },
       cardTitle,
     ),

diff --git a/styles/styles.css b/styles/styles.css
@@ -113,15 +113,15 @@
     color: rgb(17 24 39 / var(--tw-text-opacity));
 }
 
-.blog main p:not(.related-articles p){
+.blog main p{
     margin-top: 0.75rem;
     font-size: 1rem;
     line-height: 1.75rem;
     --tw-text-opacity: 1;
     color: rgb(55 65 81 / var(--tw-text-opacity));
 }
 
-.blog main p:not(.related-articles p) a{
+.blog main p a{
     position: relative;
     z-index: 0;
     word-break: break-all;
@@ -130,7 +130,7 @@
     text-decoration-thickness: 3px;
 }
 
-.blog main p:not(.related-articles p) a:hover{
+.blog main p a:hover{
     --tw-bg-opacity: 1;
     background-color: rgb(59 199 229 / var(--tw-bg-opacity));
     --tw-text-opacity: 1;
@@ -147,7 +147,7 @@
     padding-right: 0.5rem !important;
 }
 
-.blog main h2:not(.related-articles h2){
+.blog main h2{
     display: inline-flex;
     font-size: 1.25rem;
     line-height: 1.75rem;
@@ -2280,6 +2280,10 @@ main .section{
     margin-bottom: auto;
 }
 
+.\!mb-4{
+    margin-bottom: 1rem !important;
+}
+
 .-mr-px{
     margin-right: -1px;
 }
@@ -2368,18 +2372,18 @@ main .section{
     margin-top: auto;
 }
 
-.line-clamp-2{
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
+.\!line-clamp-3{
+    overflow: hidden !important;
+    display: -webkit-box !important;
+    -webkit-box-orient: vertical !important;
+    -webkit-line-clamp: 3 !important;
 }
 
-.line-clamp-3{
+.line-clamp-2{
     overflow: hidden;
     display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
+    -webkit-line-clamp: 2;
 }
 
 .block{
@@ -2414,6 +2418,10 @@ main .section{
     display: none;
 }
 
+.\!h-20{
+    height: 5rem !important;
+}
+
 .h-12{
     height: 3rem;
 }
@@ -2430,10 +2438,6 @@ main .section{
     height: 0.5rem;
 }
 
-.h-20{
-    height: 5rem;
-}
-
 .h-3{
     height: 0.75rem;
 }
@@ -2797,8 +2801,8 @@ main .section{
     white-space: nowrap;
 }
 
-.break-words{
-    overflow-wrap: break-word;
+.\!break-words{
+    overflow-wrap: break-word !important;
 }
 
 .break-all{
@@ -2943,6 +2947,16 @@ main .section{
     padding: 1rem;
 }
 
+.\!px-6{
+    padding-left: 1.5rem !important;
+    padding-right: 1.5rem !important;
+}
+
+.\!py-1{
+    padding-top: 0.25rem !important;
+    padding-bottom: 0.25rem !important;
+}
+
 .px-2{
     padding-left: 0.5rem;
     padding-right: 0.5rem;
@@ -2973,11 +2987,6 @@ main .section{
     padding-right: 2.25rem;
 }
 
-.py-1{
-    padding-top: 0.25rem;
-    padding-bottom: 0.25rem;
-}
-
 .py-2{
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
@@ -3018,6 +3027,14 @@ main .section{
     padding-bottom: 2rem;
 }
 
+.\!pb-3{
+    padding-bottom: 0.75rem !important;
+}
+
+.\!pt-4{
+    padding-top: 1rem !important;
+}
+
 .pb-0{
     padding-bottom: 0px;
 }
@@ -3026,10 +3043,6 @@ main .section{
     padding-bottom: 0.5rem;
 }
 
-.pb-3{
-    padding-bottom: 0.75rem;
-}
-
 .pb-6{
     padding-bottom: 1.5rem;
 }
@@ -3082,6 +3095,16 @@ main .section{
     vertical-align: top;
 }
 
+.\!text-lg{
+    font-size: 1.125rem !important;
+    line-height: 1.75rem !important;
+}
+
+.\!text-sm{
+    font-size: 0.875rem !important;
+    line-height: 1.25rem !important;
+}
+
 .text-2xl{
     font-size: 1.5rem;
     line-height: 2rem;
@@ -3135,6 +3158,10 @@ main .section{
     font-weight: 400 !important;
 }
 
+.\!font-semibold{
+    font-weight: 600 !important;
+}
+
 .font-bold{
     font-weight: 700;
 }
@@ -3192,6 +3219,21 @@ main .section{
     color: rgb(0 0 0 / var(--tw-text-opacity)) !important;
 }
 
+.\!text-danahergray-900{
+    --tw-text-opacity: 1 !important;
+    color: rgb(17 24 39 / var(--tw-text-opacity)) !important;
+}
+
+.\!text-danaherpurple-500{
+    --tw-text-opacity: 1 !important;
+    color: rgb(117 35 255 / var(--tw-text-opacity)) !important;
+}
+
+.\!text-gray-500{
+    --tw-text-opacity: 1 !important;
+    color: rgb(107 114 128 / var(--tw-text-opacity)) !important;
+}
+
 .text-black{
     --tw-text-opacity: 1;
     color: rgb(0 0 0 / var(--tw-text-opacity));
@@ -3217,11 +3259,6 @@ main .section{
     color: rgb(55 65 81 / var(--tw-text-opacity));
 }
 
-.text-danahergray-900{
-    --tw-text-opacity: 1;
-    color: rgb(17 24 39 / var(--tw-text-opacity));
-}
-
 .text-danaherpurple-500{
     --tw-text-opacity: 1;
     color: rgb(117 35 255 / var(--tw-text-opacity));

diff --git a/templates/blog/blog.css b/templates/blog/blog.css
@@ -22,15 +22,15 @@
   @apply inline-flex font-semibold text-xl text-danahergray-900;
 }
 
-.blog main p:not(.related-articles p) {
+.blog main p {
   @apply mt-3 leading-7 href-text text-base text-danahergray-700;
 }
 
 .blog main .default-content-wrapper p{
   @apply !px-2;
 }
 
-.blog main h2:not(.related-articles h2) {
+.blog main h2 {
   @apply inline-flex font-semibold text-xl text-danahergray-900;
 }