Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 50 additions & 48 deletions src/components/Molecules/ArticleTeaser/ArticleTeaser.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SRLogo from './assets/SRlogo.svg';
import CRLogo from './assets/CRlogo.svg';
import RNDLogo from './assets/RNDlogo.svg';
import {
Wrapper, Link, ImageWrapper, CopyWrapper, Title, Date, Time, Image, CtaWrapper
OuterWrapper, InnerWrapper, Link, ImageWrapper, CopyWrapper, Title, Date, Time, Image, CtaWrapper
} from './ArticleTeaser.style';

import altCtaUnderline from '../../../theme/shared/assets/alt_cta_underline.svg';
Expand Down Expand Up @@ -44,55 +44,57 @@ const ArticleTeaser = ({
const thisCampaignLogo = !isNewsTeaser && handleCampaignLogo(category);

return (
<Wrapper isNewsTeaser={isNewsTeaser}>
<OuterWrapper isNewsTeaser={isNewsTeaser}>
<Link href={href} type="standard" category={category} isNewsTeaser={isNewsTeaser} underline={false}>
<ImageWrapper isNewsTeaser={isNewsTeaser}>
<Image
imageLow={isNewsTeaser ? imageLow : thisCampaignLogo}
images={isNewsTeaser ? images : thisCampaignLogo}
image={isNewsTeaser ? image : thisCampaignLogo}
alt={alt}
objectFit="cover"
width={!isNewsTeaser ? logoSize : '100%'}
height="auto"
/>
</ImageWrapper>
<CopyWrapper isNewsTeaser={isNewsTeaser}>
{date && (
<Date size="xs" weight="bold">
{date}
</Date>
)}
<Title
time={time}
tag="h4"
>
{title}
</Title>
{time && (
<Time size="xs" weight="400" color="grey_dark">
{time}
</Time>
)}
<CtaWrapper>
<CtaText>
Read more
<CtaTextUnderline
src={altCtaUnderline}
alt="Read more"
/>
</CtaText>
<CtaIconWrapper>
<ArrowIconWrapper $preventHoverColourChange>
<ArrowIconInner>
<ArrowIcon />
</ArrowIconInner>
</ArrowIconWrapper>
</CtaIconWrapper>
</CtaWrapper>
</CopyWrapper>
<InnerWrapper isNewsTeaser={isNewsTeaser}>
<ImageWrapper isNewsTeaser={isNewsTeaser}>
<Image
imageLow={isNewsTeaser ? imageLow : thisCampaignLogo}
images={isNewsTeaser ? images : thisCampaignLogo}
image={isNewsTeaser ? image : thisCampaignLogo}
alt={alt}
objectFit="cover"
width={!isNewsTeaser ? logoSize : '100%'}
height="auto"
/>
</ImageWrapper>
<CopyWrapper isNewsTeaser={isNewsTeaser}>
{date && (
<Date size="xs" weight="bold">
{date}
</Date>
)}
<Title
time={time}
tag="h4"
>
{title}
</Title>
{time && (
<Time size="xs" weight="400" color="grey_dark">
{time}
</Time>
)}
<CtaWrapper>
<CtaText>
Read more
<CtaTextUnderline
src={altCtaUnderline}
alt="Read more"
/>
</CtaText>
<CtaIconWrapper>
<ArrowIconWrapper $preventHoverColourChange>
<ArrowIconInner>
<ArrowIcon />
</ArrowIconInner>
</ArrowIconWrapper>
</CtaIconWrapper>
</CtaWrapper>
</CopyWrapper>
</InnerWrapper>
</Link>
</Wrapper>
</OuterWrapper>
);
};

Expand Down
68 changes: 38 additions & 30 deletions src/components/Molecules/ArticleTeaser/ArticleTeaser.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,23 @@ const Image = styled(Picture)`
overflow: hidden;
`;

const InnerWrapper = styled.div`
display: flex;
width: 100%;
border-radius: 1rem;
overflow: hidden;
background-color: ${({ theme }) => theme.color('white')};
flex-direction: ${({ isNewsTeaser }) => (!isNewsTeaser ? 'row' : 'column')};

@media ${({ theme }) => theme.allBreakpoints('M')} {
flex-direction: row;
}

@media ${({ theme }) => theme.allBreakpoints('L')} {
flex-direction: ${({ isNewsTeaser }) => isNewsTeaser && 'column'};
}
`;

const CtaWrapper = styled.div`
width: 100%;
height: auto;
Expand All @@ -38,18 +55,14 @@ const CtaWrapper = styled.div`
}
`;

const Wrapper = styled.article`
width: 100%;
height: 100%;
const Link = styled(link)`
padding: 0;
display: flex;
background-color: ${({ theme }) => theme.color('white')};
border-radius: 1rem;
overflow: hidden;
${defaultBoxShadow()}

&:hover {
${defaultBoxShadow(true)}
}
height: 100%;
align-items: ${({ isNewsTeaser }) => (!isNewsTeaser) && 'center'};
text-decoration: none;
color: inherit;
width: 100%;

${ArrowIconWrapper} {
background-color: ${({ theme }) => theme.color('red')};
Expand All @@ -59,9 +72,13 @@ const Wrapper = styled.article`
background-color: ${({ theme }) => theme.color('black')};
}
}

@media ${({ theme }) => theme.allBreakpoints('M')} {
${bounceUpAnimation(true, 10, 2)};
${bounceUpAnimation(true, 10, 2, true)};

${InnerWrapper} {
${defaultBoxShadow()}
}

${Image} img {
// Only set up imageZoom pre-zoom defaults when we actually need them:
Expand All @@ -71,6 +88,10 @@ const Wrapper = styled.article`
}

&:hover {
${InnerWrapper} {
${defaultBoxShadow(true)}
}

${Image} img {
${({ isNewsTeaser }) => css`
${imageZoom({ zoomed: true, finalScale: (isNewsTeaser ? 1.04 : 1) })}
Expand All @@ -95,23 +116,10 @@ const Wrapper = styled.article`
}
`;

const Link = styled(link)`
padding: 0;
display: flex;
height: 100%;
flex-direction: ${({ isNewsTeaser }) => (!isNewsTeaser ? 'row' : 'column')};
align-items: ${({ isNewsTeaser }) => (!isNewsTeaser) && 'center'};
text-decoration: none;
color: inherit;
const OuterWrapper = styled.article`
width: 100%;

@media ${({ theme }) => theme.allBreakpoints('M')} {
flex-direction: row;
}

@media ${({ theme }) => theme.allBreakpoints('L')} {
flex-direction: ${({ isNewsTeaser }) => isNewsTeaser && 'column'};
}
height: 100%;
display: flex;
`;

const ImageWrapper = styled.div`
Expand Down Expand Up @@ -168,5 +176,5 @@ const Time = styled(Text)`
`;

export {
Wrapper, Link, ImageWrapper, CopyWrapper, Title, Date, Time, Image, CtaWrapper
OuterWrapper, InnerWrapper, Link, ImageWrapper, CopyWrapper, Title, Date, Time, Image, CtaWrapper
};
Loading
Loading