Changes for using default settings for AUS Ticker

guardian · Nov 22, 2024 · ef3e657 · ef3e657
1 parent 77e30ad
commit ef3e657
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/dotcom-rendering/src/components/marketing/banners/designableBanner/DesignableBanner.tsx b/dotcom-rendering/src/components/marketing/banners/designableBanner/DesignableBanner.tsx
@@ -281,10 +281,10 @@ const DesignableBanner: ReactComponent<BannerRenderProps> = ({
 	};
 
 	const ausEOYTickerStylingSettings = {
-		filledProgressColour: '#FBBCC7',
-		progressBarBackgroundColour: 'rgba(196, 28, 28, 0.30)',
+		filledProgressColour: '#C41C1C',
+		progressBarBackgroundColour: '#D9A78E',
 		headlineColour: '#000000',
-		totalColour: '#FBBCC7',
+		totalColour: '#C41C1C',
 		goalColour: '#000000',
 	};
 
@@ -299,7 +299,7 @@ const DesignableBanner: ReactComponent<BannerRenderProps> = ({
 	);
 
 	const getHeaderContainerCss = () => {
-		if (templateSettings.headerSettings?.headerImage) {
+		if (templateSettings?.headerSettings?.headerImage) {
 			return styles.headerWithImageContainer(
 				templateSettings.containerSettings.backgroundColour,
 			);

diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpic.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpic.tsx
@@ -152,14 +152,6 @@ const usEOYTickerStylingSettings: TickerSettings['tickerStylingSettings'] = {
 	goalColour: '#000000',
 };
 
-const ausEOYTickerStylingSettings: TickerSettings['tickerStylingSettings'] = {
-	filledProgressColour: '#FBBCC7',
-	progressBarBackgroundColour: 'rgba(196, 28, 28, 0.30)',
-	headlineColour: '#000000',
-	totalColour: '#FBBCC7',
-	goalColour: '#000000',
-};
-
 const articleCountAboveContainerStyles = css`
 	margin-bottom: ${space[4]}px;
 `;
@@ -468,9 +460,8 @@ const ContributionsEpic: ReactComponent<EpicProps> = ({
 						}}
 						tickerData={tickerSettings.tickerData}
 						tickerStylingSettings={
+							isColourInTestVariant ||
 							tickerSettings.name === 'AU'
-								? ausEOYTickerStylingSettings
-								: isColourInTestVariant
 								? usEOYTickerStylingSettings
 								: defaultTickerStylingSettings
 						}

diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsLiveblogEpic.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsLiveblogEpic.tsx
@@ -116,14 +116,6 @@ const defaultTickerStylingSettings: TickerSettings['tickerStylingSettings'] = {
 	goalColour: '#000000',
 };
 
-const ausEOYTickerStylingSettings: TickerSettings['tickerStylingSettings'] = {
-	filledProgressColour: '#FBBCC7',
-	progressBarBackgroundColour: 'rgba(196, 28, 28, 0.30)',
-	headlineColour: '#000000',
-	totalColour: '#FBBCC7',
-	goalColour: '#000000',
-};
-
 interface LiveblogEpicBodyParagraphProps {
 	paragraph: string;
 	numArticles: number;
@@ -237,11 +229,7 @@ export const ContributionsLiveblogEpic: ReactComponent<EpicProps> = ({
 								headline: tickerSettings.copy.countLabel,
 							}}
 							tickerData={tickerSettings.tickerData}
-							tickerStylingSettings={
-								tickerSettings.name === 'AU'
-									? ausEOYTickerStylingSettings
-									: defaultTickerStylingSettings
-							}
+							tickerStylingSettings={defaultTickerStylingSettings}
 							size={'medium'}
 						/>
 					</div>