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
2 changes: 1 addition & 1 deletion src/components/Molecules/ArticleTeaser/ArticleTeaser.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ArticleTeaser = ({
alt={alt}
objectFit="cover"
width={!isNewsTeaser ? logoSize : '100%'}
height="auto"
height={!isNewsTeaser ? 'auto' : '100%'}
/>
</ImageWrapper>
<CopyWrapper isNewsTeaser={isNewsTeaser}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Molecules/ArticleTeaser/ArticleTeaser.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const defaultData = require('../../../styleguide/data/data').defaultData;
<div style={{ margin: '1rem', width: 'calc(100% - 2rem)' }}>
<ArticleTeaser
href="/test"
images={defaultData.images}
images={defaultData.newsImage}
imageLow={defaultData.imageLow}
date=" 01 July 2019"
title="News article"
Expand Down
8 changes: 4 additions & 4 deletions src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ it('renders article teaser correctly', () => {
.c6 {
display: block;
width: 100%;
height: auto;
height: 100%;
position: relative;
}

.c9 {
width: 100%;
height: auto;
height: 100%;
display: block;
object-fit: cover;
}
Expand Down Expand Up @@ -466,7 +466,7 @@ it('renders article teaser correctly', () => {
>
<div
className="c6 c7 c8"
height="auto"
height="100%"
width="100%"
>
<img
Expand All @@ -476,7 +476,7 @@ it('renders article teaser correctly', () => {
data-sizes="auto"
data-src="http://images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg"
data-srcset="//images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg?w=200&h=150&q=50 200w,//images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg?w=400&h=300&q=50 400w,//images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg?w=800&h=600&q=50 800w,//images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg?w=1200&h=900&q=50 1200w,//images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg?w=1440&h=1080&q=50 1440w"
height="auto"
height="100%"
src="http://images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg"
srcSet="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
width="100%"
Expand Down
Binary file added src/styleguide/assets/newsPhoto.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/styleguide/data/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const defaultData = {
heroBannerLogoImageSquare: '../HeroBannerLogo-Square.png',
heroBannerLogoImageWide: '../HeroBannerLogo-Wide.png',
heroBannerLogoImageTall: '../HeroBannerLogo-Tall.png',
newsImage: '../newsPhoto.jpg',
imageLow:
'http://images.ctfassets.net/zsfivwzfgl3t/Yq59XdwwQgjNOxky93K1Q/17c2d80dce99067b0b3508f33075cbe3/funding_4-3_2x.jpg?w=100&h=50&q=100',
image:
Expand Down
Loading