Fix issues after rebasing

Author: ioannakok

dotcom-rendering/src/components/Caption.tsx

@@ -35,7 +35,6 @@ type Props = {
 
 type IconProps = {
 	format: ArticleFormat;
-	isMainMedia: boolean;
 };
 
 const captionStyle = (isMainMedia: boolean) => css`
@@ -170,10 +169,8 @@ const hideIconBelowLeftCol = css`
 const pictureRatio = (13 / 18) * 100;
 const videoRatio = (23 / 36) * 100;
 
-const iconStyle = (format: ArticleFormat, isMainMedia: boolean) => css`
-	fill: ${format.design === ArticleDesign.Gallery && isMainMedia
-		? palette('--caption-main-media-text')
-		: palette('--caption-text')};
+const iconStyle = css`
+	fill: ${palette('--caption-text')};
 	margin-right: ${space[1]}px;
 	display: inline-block;
 	position: relative;
@@ -265,11 +262,11 @@ const CameraIcon = ({ format }: IconProps) => {
 	);
 };
 
-const VideoIcon = ({ format, isMainMedia }: IconProps) => {
+const VideoIcon = ({ format }: IconProps) => {
 	return (
 		<span
 			css={[
-				iconStyle(format, isMainMedia),
+				iconStyle,
 				format.display === ArticleDisplay.Immersive &&
 					hideIconBelowLeftCol,
 				videoIconStyle,