Skip to content

Remove flexible container check from card #15982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
abeddow91 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −18
Draft

Remove flexible container check from card #15982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion dotcom-rendering/src/components/Card/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,6 @@ export const Card = ({
imageSize={mediaSize}
imagePositionOnDesktop={mediaPositionOnDesktop}
imagePositionOnMobile={mediaPositionOnMobile}
isFlexibleContainer={isFlexibleContainer}
>
<Avatar
src={media.avatarUrl}
Expand Down
28 changes: 11 additions & 17 deletions dotcom-rendering/src/components/Card/components/AvatarContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ type Props = {
imageSize: MediaSizeType;
imagePositionOnDesktop: MediaPositionType;
imagePositionOnMobile: MediaPositionType;
isFlexibleContainer: boolean;
};

const sideMarginStyles = css`
Expand All @@ -16,7 +15,6 @@ const sideMarginStyles = css`

const sizingStyles = (
imageSize: MediaSizeType,
isFlexibleContainer: boolean,
isVerticalOnDesktop: boolean,
isVerticalOnMobile: boolean,
) => {
Expand All @@ -34,19 +32,10 @@ const sizingStyles = (
switch (imageSize) {
case 'small':
case 'scrollable-small':
return isFlexibleContainer
? css`
width: 90px;
height: 90px;
${until.tablet} {
height: 80px;
width: 80px;
}
`
: css`
width: 80px;
height: 80px;
`;
return css`
width: 80px;
height: 80px;
`;
case 'large':
case 'xlarge':
return css`
Expand All @@ -71,6 +60,13 @@ const sizingStyles = (
}
`;
case 'medium':
case 'carousel':
case 'scrollable-medium':
case 'podcast':
case 'highlights-card':
case 'feature':
case 'feature-large':
case 'feature-immersive':
default:
return css`
width: 90px;
Expand All @@ -88,7 +84,6 @@ export const AvatarContainer = ({
imageSize,
imagePositionOnDesktop,
imagePositionOnMobile,
isFlexibleContainer,
}: Props) => {
const isVerticalOnDesktop =
imagePositionOnDesktop === 'top' || imagePositionOnDesktop === 'bottom';
Expand All @@ -101,7 +96,6 @@ export const AvatarContainer = ({
sideMarginStyles,
sizingStyles(
imageSize,
isFlexibleContainer,
isVerticalOnDesktop,
isVerticalOnMobile,
),
Expand Down
Loading