Merge branch 'bose/2272' into staging

equinor · Apr 30, 2024 · 93a769d · 93a769d
2 parents 9c9e7e2 + 426afa9
commit 93a769d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/web/pageComponents/pageTemplates/TopicPage.tsx b/web/pageComponents/pageTemplates/TopicPage.tsx
@@ -5,7 +5,7 @@ import Seo from '../shared/Seo'
 import { SharedBanner } from './shared/SharedBanner'
 import { PageContent } from './shared/SharedPageContent'
 import SharedTitle from './shared/SharedTitle'
-import { Breadcrumbs } from '@core/Breadcrumbs'
+import { Breadcrumbs } from '../topicPages/Breadcrumbs'
 
 const TopicPageLayout = styled.main`
   /* The neverending spacing story... If two sections with the same background colour
@@ -56,9 +56,19 @@ const TopicPage = ({ data }: TopicPageProps) => {
           <Breadcrumbs
             background={titleStyles.background}
             slug={data?.slug}
-            breadcrumbs={breadcrumbs?.defaultBreadcrumbs}
+            useCustomBreadcrumbs={breadcrumbs?.useCustomBreadcrumbs}
+            defaultBreadcrumbs={breadcrumbs?.defaultBreadcrumbs}
             customBreadcrumbs={breadcrumbs?.customBreadcrumbs}
+            containerStyles={{
+              hasTopMargin: data.hero.type !== 'default',
+            }}
           />
+          /*           <Breadcrumbs
+            background={titleStyles.background}
+            slug={data?.slug}
+            breadcrumbs={breadcrumbs?.defaultBreadcrumbs}
+            customBreadcrumbs={breadcrumbs?.customBreadcrumbs}
+          /> */
         )}
 
         {data.hero.type !== HeroTypes.DEFAULT && !data?.isCampaign && (

diff --git a/web/pageComponents/topicPages/Breadcrumbs.tsx b/web/pageComponents/topicPages/Breadcrumbs.tsx
@@ -30,7 +30,6 @@ const StyledBreadcrumbsListItem = styled(BreadcrumbsListItem)<{ $bgColor?: Backg
 `
 
 const StyledNextLink = styled(NextLink)<{ $bgColor?: BackgroundColours }>`
-  text-decoration: none;
   color: var(--color-on-background);
 `
 
@@ -94,7 +93,7 @@ export const Breadcrumbs = ({
           }
           return (
             <BreadcrumbsListItem key={item.slug}>
-              <StyledNextLink href={item.slug} prefetch={false}>
+              <StyledNextLink href={item.slug} prefetch={false} className="hover:underline no-underline">
                 {item.label}
               </StyledNextLink>
             </BreadcrumbsListItem>

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml