🐛 Fix featured content #2369 (#2370)

* 🐛 set height to fit * 🐛 fix headings
equinor · Jun 13, 2024 · a68bfa5 · a68bfa5
1 parent e5ede13
commit a68bfa5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/web/core/Typography/variants.ts b/web/core/Typography/variants.ts
@@ -1,8 +1,8 @@
 const variants = {
   heading: {
-    h1: 'text-slate-80 dark:text-white-100 text-3xl leading-earthy font-normal pb-8',
-    h2: 'text-slate-80 dark:text-white-100 text-2xl leading-cloudy font-normal pb-8',
-    h3: 'text-slate-80 dark:text-white-100 text-xl leading-inherit font-normal pb-0',
+    h1: 'text-slate-80 dark:text-white-100 text-3xl leading-earthy font-normal pb-11 my-0',
+    h2: 'text-slate-80 dark:text-white-100 text-2xl leading-cloudy font-normal pb-8 my-0',
+    h3: 'text-slate-80 dark:text-white-100 text-xl leading-inherit font-normal pb-0 my-0',
     h4: 'text-slate-80 dark:text-white-100 text-lg leading-inherit font-normal pb-0',
     h5: 'text-slate-80 dark:text-white-100 text-md leading-inherit font-normal pb-0',
     h6: 'text-slate-80 dark:text-white-100 text-base leading-inherit font-normal pb-0',

diff --git a/web/pageComponents/pageTemplates/shared/SharedTitle.tsx b/web/pageComponents/pageTemplates/shared/SharedTitle.tsx
@@ -13,7 +13,7 @@ const SharedTitle = ({ sharedTitle, background }: SharedTitleProps) => {
         value={sharedTitle}
         as="h1"
         variant="3xl"
-        className="py-8 px-layout-lg max-w-viewport mx-auto text-pretty"
+        className="py-11 my-0 px-layout-lg max-w-viewport mx-auto text-pretty"
       />
     </BackgroundContainer>
   )

diff --git a/web/pageComponents/shared/siteMenu/FeaturedContent.tsx b/web/pageComponents/shared/siteMenu/FeaturedContent.tsx
@@ -13,7 +13,7 @@ const FeaturedContent = ({ data }: Props) => {
   //To destructure and get rid of 2 but keep rest
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { routeContentType, type, ...restData } = data
-  const containerClassName = 'hidden xl:block pl-6 border-l border-autumn-storm-50 w-[20vw]'
+  const containerClassName = 'hidden xl:block pl-6 border-l border-autumn-storm-50 w-[16vw]'
 
   if (isEvent(data)) {
     return (
@@ -26,14 +26,15 @@ const FeaturedContent = ({ data }: Props) => {
             } as EventCardData
           }
           hasSectionTitle={false}
+          className="h-fit"
         />
       </div>
     )
   }
 
   return (
     <div className={containerClassName}>
-      <PromotionCard data={data} hasSectionTitle={false} />
+      <PromotionCard data={data} hasSectionTitle={false} className="h-fit" />
     </div>
   )
 }