Merge branch 'malj/2009' into staging

equinor · Dec 19, 2023 · 9d4ecde · 9d4ecde
2 parents 5b3defe + 098f223
commit 9d4ecde
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/sanityv3/schemas/objects/teaser.tsx b/sanityv3/schemas/objects/teaser.tsx
@@ -33,7 +33,7 @@ const blockConfig = {
   internalLink: false,
   externalLink: false,
   attachment: false,
-  lists: false,
+  lists: true,
 }
 
 const blockContentType = configureBlockContent({ ...blockConfig })

diff --git a/web/components/src/Teaser/Content.tsx b/web/components/src/Teaser/Content.tsx
@@ -3,7 +3,6 @@ import styled from 'styled-components'
 
 const StyledContent = styled.div`
   display: grid;
-  grid-gap: var(--space-large);
   grid-auto-columns: auto;
   align-items: center;
   align-content: start;
@@ -13,6 +12,9 @@ const StyledContent = styled.div`
   p {
     margin-bottom: 0;
   }
+  ul {
+    margin-bottom: var(--space-medium);
+  }
 
   @media (min-width: 750px) {
     /*  max-height: 800px; */

diff --git a/web/pageComponents/shared/Teaser.tsx b/web/pageComponents/shared/Teaser.tsx
@@ -22,6 +22,14 @@ const StyledEnvisTeaser = styled(EnvisTeaser)`
   font-size: var(--typeScale-1);
 `
 
+const StyledTeaserTitle = styled(TitleText)`
+  padding-bottom: var(--space-large);
+`
+
+const ContentWrapper = styled.div`
+  padding-bottom: var(--space-large);
+`
+
 const TeaserImage = ({ image }: { image: ImageWithAlt }) => {
   const imageSrc =
     image.extension === 'svg' ? urlFor(image).toString() : urlFor(image).size(1200, 800).auto('format').toString()
@@ -106,11 +114,11 @@ const Teaser = ({ data, anchor }: TeaserProps) => {
               />
             )
           ) : (
-            <>
+            <ContentWrapper>
               {overline && <Eyebrow>{overline}</Eyebrow>}
-              {title && <TitleText value={title} />}
+              {title && <StyledTeaserTitle value={title} />}
               {text && <IngressText value={text} />}
-            </>
+            </ContentWrapper>
           )}
           {action && <TeaserAction action={action} />}
         </Content>