@ongov/ontario-design-system-component-library 4.3.0 → 5.0.0-alpha.1

package/dist/types/components.d.ts

@@ -16,10 +16,10 @@ import {
 import { BadgeColour } from './components/ontario-badge/ontario-badge.types';
 import { ButtonType, HtmlType } from './components/ontario-button/ontario-button.types';
 import {
-	CardType,
-	HeaderType,
+	HeaderColour,
 	HorizontalImagePositionType,
 	HorizontalImageSizeType,
+	Layout,
 } from './components/ontario-card/ontario-card-types';
 import { CardsPerRow } from './components/ontario-card-collection/ontario-collection-card-types';
 import { Caption } from './utils/common/input-caption/caption.interface';
@@ -68,10 +68,10 @@ export {
 export { BadgeColour } from './components/ontario-badge/ontario-badge.types';
 export { ButtonType, HtmlType } from './components/ontario-button/ontario-button.types';
 export {
-	CardType,
-	HeaderType,
+	HeaderColour,
 	HorizontalImagePositionType,
 	HorizontalImageSizeType,
+	Layout,
 } from './components/ontario-card/ontario-card-types';
 export { CardsPerRow } from './components/ontario-card-collection/ontario-collection-card-types';
 export { Caption } from './utils/common/input-caption/caption.interface';
@@ -248,18 +248,14 @@ export namespace Components {
 		 * Action link for when the card is clicked.  This is optional.
 		 */
 		cardLink?: string;
-		/**
-		 * The type of card to render.  If no type is passed, it will default to 'basic'.
-		 */
-		cardType: CardType;
 		/**
 		 * Text to be displayed within the card description container.  This is optional.
 		 */
 		description?: string;
 		/**
-		 * The type of header to render.  If no type is passed, it will default to 'default'.
+		 * Set the card's header colour.  This is optional.
 		 */
-		headerType: HeaderType;
+		headerColour?: HeaderColour;
 		/**
 		 * The position of the image when the card-type is set to 'horizontal'.  This prop is only necessry when the card-type is set to 'horizontal'.
 		 * @example 	<ontario-card 	card-type="horizontal" 	label="Card Title 1" 	image="https://picsum.photos/200/300" 	horizontal-image-position-type="left" 	horizontal-image-size-type="one-fourth"   description="Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum" > </ontario-card>
@@ -279,6 +275,10 @@ export namespace Components {
 		 * @example <ontario-card 	header-type="dark" 	card-type="horizontal" 	label="Card Title 1" 	description="Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum" >
 		 */
 		label: string;
+		/**
+		 * The layout oritnetation of the card.  If no type is passed, it will default to 'vertical'.
+		 */
+		layout?: Layout;
 	}
 	interface OntarioCardCollection {
 		/**
@@ -1725,7 +1725,10 @@ export namespace Components {
 		 * A custom function to pass to the language toggle button.  This is optional.
 		 */
 		customLanguageToggle?: (event: globalThis.Event) => void;
-		language: Language | string;
+		/**
+		 * The language of the component.  In most cases, the language toggle should be the source of truth for determining the site language.  Only pass a language value here if necessary.
+		 */
+		language?: Language;
 		/**
 		 * The size of the language toggle button.  If no prop is passed, it will be set to the `default` size.
 		 */
@@ -1823,6 +1826,54 @@ export namespace Components {
 		 */
 		required?: boolean;
 	}
+	interface OntarioSearchBox {
+		/**
+		 * The text to display as the input label
+		 * @example <ontario-search-box      caption='{ 		"captionText": "Search directory", 		"captionType": "default" 		}' 	required = "true" > </ontario-search-box>
+		 */
+		caption: Caption | string;
+		/**
+		 * Used to add a custom function to the input onBlur event.
+		 */
+		customOnBlur?: (event: globalThis.Event) => void;
+		/**
+		 * Used to add a custom function to the input onChange event.
+		 */
+		customOnChange?: (event: globalThis.Event) => void;
+		/**
+		 * Used to add a custom function to the input onFocus event.
+		 */
+		customOnFocus?: (event: globalThis.Event) => void;
+		/**
+		 * Used to add a custom function to the input onInput event.
+		 */
+		customOnInput?: (event: globalThis.Event) => void;
+		/**
+		 * The unique identifier of the search-box component. This is optional - if no ID is passed, one will be generated.
+		 */
+		elementId?: string;
+		/**
+		 * Used to include the ontario-hint-text component for the search-box. This is optional.
+		 */
+		hintText?: string | Hint;
+		/**
+		 * The language of the component. This is used for translations. If none is passed, it will default to English.
+		 */
+		language?: Language;
+		/**
+		 * This Function to perform a search operation. This function will be called when the search submit button is triggered. The value argument is used for as search term to use for the search operation. This parameter is optional. The performSearch prop can be set dynamically using JavaScript, allowing you to define custom search functionality when the search form is submitted.
+		 * @example <ontario-search-box   id="ontario-search-box"   caption='Search directory' ></ontario-search-box>  <script> window.addEventListener('load', () => { 	const searchBox = document.getElementById('ontario-search-box'); 	searchBox.performSearch = async (value) => { 			console.log('Performing search with value:', value); 	}; }); </script>
+		 */
+		performSearch?: (value?: string) => Promise<void>;
+		/**
+		 * This is used to determine whether the dropdown list is required or not. This prop gets passed to the InputCaption utility to display either an optional or required flag in the label. If no prop is set, it will default to false (optional).
+		 */
+		required?: boolean;
+		/**
+		 * The value of the search term. This is optional.
+		 */
+		value?: string;
+	}
 	interface OntarioStepIndicator {
 		/**
 		 * URL for the back element to set a path for where the link will lead.  If a URL is passed in, the back element will display as an anchor tag. The back element will require either the backButtonURL prop or the customOnClick prop to be passed in order for the back element to display.
@@ -1966,6 +2017,10 @@ export interface OntarioRadioButtonsCustomEvent<T> extends CustomEvent<T> {
 	detail: T;
 	target: HTMLOntarioRadioButtonsElement;
 }
+export interface OntarioSearchBoxCustomEvent<T> extends CustomEvent<T> {
+	detail: T;
+	target: HTMLOntarioSearchBoxElement;
+}
 export interface OntarioTextareaCustomEvent<T> extends CustomEvent<T> {
 	detail: T;
 	target: HTMLOntarioTextareaElement;
@@ -2893,7 +2948,7 @@ declare global {
 		new (): HTMLOntarioInputElement;
 	};
 	interface HTMLOntarioLanguageToggleElementEventMap {
-		setAppLanguage: string;
+		setAppLanguage: Language;
 		headerLanguageToggled: HeaderLanguageToggleEventDetails;
 	}
 	interface HTMLOntarioLanguageToggleElement extends Components.OntarioLanguageToggle, HTMLStencilElement {
@@ -3016,6 +3071,65 @@ declare global {
 		prototype: HTMLOntarioRadioButtonsElement;
 		new (): HTMLOntarioRadioButtonsElement;
 	};
+	interface HTMLOntarioSearchBoxElementEventMap {
+		searchOnSubmit: string;
+		inputOnInput: InputInputEvent;
+		inputOnChange: InputInteractionEvent;
+		inputOnBlur: InputFocusBlurEvent;
+		inputOnFocus: InputFocusBlurEvent;
+	}
+	interface HTMLOntarioSearchBoxElement extends Components.OntarioSearchBox, HTMLStencilElement {
+		addEventListener<K extends keyof HTMLOntarioSearchBoxElementEventMap>(
+			type: K,
+			listener: (
+				this: HTMLOntarioSearchBoxElement,
+				ev: OntarioSearchBoxCustomEvent<HTMLOntarioSearchBoxElementEventMap[K]>,
+			) => any,
+			options?: boolean | AddEventListenerOptions,
+		): void;
+		addEventListener<K extends keyof DocumentEventMap>(
+			type: K,
+			listener: (this: Document, ev: DocumentEventMap[K]) => any,
+			options?: boolean | AddEventListenerOptions,
+		): void;
+		addEventListener<K extends keyof HTMLElementEventMap>(
+			type: K,
+			listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any,
+			options?: boolean | AddEventListenerOptions,
+		): void;
+		addEventListener(
+			type: string,
+			listener: EventListenerOrEventListenerObject,
+			options?: boolean | AddEventListenerOptions,
+		): void;
+		removeEventListener<K extends keyof HTMLOntarioSearchBoxElementEventMap>(
+			type: K,
+			listener: (
+				this: HTMLOntarioSearchBoxElement,
+				ev: OntarioSearchBoxCustomEvent<HTMLOntarioSearchBoxElementEventMap[K]>,
+			) => any,
+			options?: boolean | EventListenerOptions,
+		): void;
+		removeEventListener<K extends keyof DocumentEventMap>(
+			type: K,
+			listener: (this: Document, ev: DocumentEventMap[K]) => any,
+			options?: boolean | EventListenerOptions,
+		): void;
+		removeEventListener<K extends keyof HTMLElementEventMap>(
+			type: K,
+			listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any,
+			options?: boolean | EventListenerOptions,
+		): void;
+		removeEventListener(
+			type: string,
+			listener: EventListenerOrEventListenerObject,
+			options?: boolean | EventListenerOptions,
+		): void;
+	}
+	var HTMLOntarioSearchBoxElement: {
+		prototype: HTMLOntarioSearchBoxElement;
+		new (): HTMLOntarioSearchBoxElement;
+	};
 	interface HTMLOntarioStepIndicatorElement extends Components.OntarioStepIndicator, HTMLStencilElement {}
 	var HTMLOntarioStepIndicatorElement: {
 		prototype: HTMLOntarioStepIndicatorElement;
@@ -3221,6 +3335,7 @@ declare global {
 		'ontario-loading-indicator': HTMLOntarioLoadingIndicatorElement;
 		'ontario-page-alert': HTMLOntarioPageAlertElement;
 		'ontario-radio-buttons': HTMLOntarioRadioButtonsElement;
+		'ontario-search-box': HTMLOntarioSearchBoxElement;
 		'ontario-step-indicator': HTMLOntarioStepIndicatorElement;
 		'ontario-table': HTMLOntarioTableElement;
 		'ontario-textarea': HTMLOntarioTextareaElement;
@@ -3365,18 +3480,14 @@ declare namespace LocalJSX {
 		 * Action link for when the card is clicked.  This is optional.
 		 */
 		cardLink?: string;
-		/**
-		 * The type of card to render.  If no type is passed, it will default to 'basic'.
-		 */
-		cardType?: CardType;
 		/**
 		 * Text to be displayed within the card description container.  This is optional.
 		 */
 		description?: string;
 		/**
-		 * The type of header to render.  If no type is passed, it will default to 'default'.
+		 * Set the card's header colour.  This is optional.
 		 */
-		headerType?: HeaderType;
+		headerColour?: HeaderColour;
 		/**
 		 * The position of the image when the card-type is set to 'horizontal'.  This prop is only necessry when the card-type is set to 'horizontal'.
 		 * @example 	<ontario-card 	card-type="horizontal" 	label="Card Title 1" 	image="https://picsum.photos/200/300" 	horizontal-image-position-type="left" 	horizontal-image-size-type="one-fourth"   description="Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum" > </ontario-card>
@@ -3396,6 +3507,10 @@ declare namespace LocalJSX {
 		 * @example <ontario-card 	header-type="dark" 	card-type="horizontal" 	label="Card Title 1" 	description="Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum" >
 		 */
 		label?: string;
+		/**
+		 * The layout oritnetation of the card.  If no type is passed, it will default to 'vertical'.
+		 */
+		layout?: Layout;
 	}
 	interface OntarioCardCollection {
 		/**
@@ -4923,15 +5038,18 @@ declare namespace LocalJSX {
 		 * A custom function to pass to the language toggle button.  This is optional.
 		 */
 		customLanguageToggle?: (event: globalThis.Event) => void;
-		language?: Language | string;
 		/**
-		 * An event that emits to other components that the language toggle button has been toggled.
+		 * The language of the component.  In most cases, the language toggle should be the source of truth for determining the site language.  Only pass a language value here if necessary.
+		 */
+		language?: Language;
+		/**
+		 * Event that fires when the language toggle is pressed/clicked.  The event contains the oldLanguage along with the newLanguage.
 		 */
 		onHeaderLanguageToggled?: (event: OntarioLanguageToggleCustomEvent<HeaderLanguageToggleEventDetails>) => void;
 		/**
-		 * An event to set the Document's HTML lang property, and emit the toggled language to other components.
+		 * Event that fires during the setAppLanguageHandler() method.  The event contains the current language (after language logic has already occurred).
 		 */
-		onSetAppLanguage?: (event: OntarioLanguageToggleCustomEvent<string>) => void;
+		onSetAppLanguage?: (event: OntarioLanguageToggleCustomEvent<Language>) => void;
 		/**
 		 * The size of the language toggle button.  If no prop is passed, it will be set to the `default` size.
 		 */
@@ -5045,6 +5163,75 @@ declare namespace LocalJSX {
 		 */
 		required?: boolean;
 	}
+	interface OntarioSearchBox {
+		/**
+		 * The text to display as the input label
+		 * @example <ontario-search-box      caption='{ 		"captionText": "Search directory", 		"captionType": "default" 		}' 	required = "true" > </ontario-search-box>
+		 */
+		caption?: Caption | string;
+		/**
+		 * Used to add a custom function to the input onBlur event.
+		 */
+		customOnBlur?: (event: globalThis.Event) => void;
+		/**
+		 * Used to add a custom function to the input onChange event.
+		 */
+		customOnChange?: (event: globalThis.Event) => void;
+		/**
+		 * Used to add a custom function to the input onFocus event.
+		 */
+		customOnFocus?: (event: globalThis.Event) => void;
+		/**
+		 * Used to add a custom function to the input onInput event.
+		 */
+		customOnInput?: (event: globalThis.Event) => void;
+		/**
+		 * The unique identifier of the search-box component. This is optional - if no ID is passed, one will be generated.
+		 */
+		elementId?: string;
+		/**
+		 * Used to include the ontario-hint-text component for the search-box. This is optional.
+		 */
+		hintText?: string | Hint;
+		/**
+		 * The language of the component. This is used for translations. If none is passed, it will default to English.
+		 */
+		language?: Language;
+		/**
+		 * Emitted when a keyboard input event occurs when an input has lost focus.
+		 */
+		onInputOnBlur?: (event: OntarioSearchBoxCustomEvent<InputFocusBlurEvent>) => void;
+		/**
+		 * Emitted when a keyboard input or mouse event occurs when an input has been changed.
+		 */
+		onInputOnChange?: (event: OntarioSearchBoxCustomEvent<InputInteractionEvent>) => void;
+		/**
+		 * Emitted when a keyboard input event occurs when an input has gained focus.
+		 */
+		onInputOnFocus?: (event: OntarioSearchBoxCustomEvent<InputFocusBlurEvent>) => void;
+		/**
+		 * Emitted when a input  occurs when an input has been changed.
+		 */
+		onInputOnInput?: (event: OntarioSearchBoxCustomEvent<InputInputEvent>) => void;
+		/**
+		 * Emitted when the search is submitted. Below is an example on how to hook into the event to get the event details.
+		 * @example <script> 	document.getElementById('ontario-search-box').addEventListener('searchOnSubmit', (event) => {  		const searchValue = event.detail; 		console.log('Search submitted with value:', searchValue);   }; 	</script>
+		 */
+		onSearchOnSubmit?: (event: OntarioSearchBoxCustomEvent<string>) => void;
+		/**
+		 * This Function to perform a search operation. This function will be called when the search submit button is triggered. The value argument is used for as search term to use for the search operation. This parameter is optional. The performSearch prop can be set dynamically using JavaScript, allowing you to define custom search functionality when the search form is submitted.
+		 * @example <ontario-search-box   id="ontario-search-box"   caption='Search directory' ></ontario-search-box>  <script> window.addEventListener('load', () => { 	const searchBox = document.getElementById('ontario-search-box'); 	searchBox.performSearch = async (value) => { 			console.log('Performing search with value:', value); 	}; }); </script>
+		 */
+		performSearch?: (value?: string) => Promise<void>;
+		/**
+		 * This is used to determine whether the dropdown list is required or not. This prop gets passed to the InputCaption utility to display either an optional or required flag in the label. If no prop is set, it will default to false (optional).
+		 */
+		required?: boolean;
+		/**
+		 * The value of the search term. This is optional.
+		 */
+		value?: string;
+	}
 	interface OntarioStepIndicator {
 		/**
 		 * URL for the back element to set a path for where the link will lead.  If a URL is passed in, the back element will display as an anchor tag. The back element will require either the backButtonURL prop or the customOnClick prop to be passed in order for the back element to display.
@@ -5315,6 +5502,7 @@ declare namespace LocalJSX {
 		'ontario-loading-indicator': OntarioLoadingIndicator;
 		'ontario-page-alert': OntarioPageAlert;
 		'ontario-radio-buttons': OntarioRadioButtons;
+		'ontario-search-box': OntarioSearchBox;
 		'ontario-step-indicator': OntarioStepIndicator;
 		'ontario-table': OntarioTable;
 		'ontario-textarea': OntarioTextarea;
@@ -5519,6 +5707,7 @@ declare module '@stencil/core' {
 				JSXBase.HTMLAttributes<HTMLOntarioLoadingIndicatorElement>;
 			'ontario-page-alert': LocalJSX.OntarioPageAlert & JSXBase.HTMLAttributes<HTMLOntarioPageAlertElement>;
 			'ontario-radio-buttons': LocalJSX.OntarioRadioButtons & JSXBase.HTMLAttributes<HTMLOntarioRadioButtonsElement>;
+			'ontario-search-box': LocalJSX.OntarioSearchBox & JSXBase.HTMLAttributes<HTMLOntarioSearchBoxElement>;
 			'ontario-step-indicator': LocalJSX.OntarioStepIndicator & JSXBase.HTMLAttributes<HTMLOntarioStepIndicatorElement>;
 			'ontario-table': LocalJSX.OntarioTable & JSXBase.HTMLAttributes<HTMLOntarioTableElement>;
 			'ontario-textarea': LocalJSX.OntarioTextarea & JSXBase.HTMLAttributes<HTMLOntarioTextareaElement>;

package/dist/types/utils/common/input/input.d.ts

@@ -17,6 +17,7 @@ export type InputProps = {
 	onChange?: ((event: Event) => void) | undefined;
 	onBlur?: ((event: Event) => void) | undefined;
 	onFocus?: ((event: Event) => void) | undefined;
-	ref?: (el: any) => HTMLElement;
+	onClick?: ((event: Event) => void) | undefined;
+	ref?: (el: HTMLInputElement) => HTMLElement;
 };
 export declare const Input: FunctionalComponent<InputProps>;

package/dist/types/utils/common/input-caption/input-caption.d.ts

@@ -40,9 +40,15 @@ export declare class InputCaption implements CaptionInfo {
 	/**
 	 * Return the `<label>` element for text inputs
 	 * @param captionFor Set the `htmlFor` attribute
+	 * @param hasHintExpander Indicate whether the component the label is for has a hint expander or not
+	 * @param disableRequiredFlag Disable the required/optional label text _(only use in highly special cases)_
 	 * @returns element containing the caption for the input
 	 */
-	getCaption: (captionFor?: string | undefined, hasHintExpander?: boolean) => HTMLElement;
+	getCaption: (
+		captionFor?: string | undefined,
+		hasHintExpander?: boolean,
+		disableRequiredFlag?: boolean,
+	) => HTMLElement;
 	getHintExpanderAccessibilityText(captionText: string, hasHintExpanderOnOption?: boolean): HTMLElement;
 	/**
 	 * Determines which flag text to use between `required` and `optional`

package/dist/types/utils/common/language-types.d.ts

@@ -1 +1,2 @@
-export type Language = 'en' | 'fr';
+export declare const supportedLanguages: readonly ['en', 'fr'];
+export type Language = (typeof supportedLanguages)[number];

package/dist/types/utils/helper/utils-types.d.ts

@@ -0,0 +1,2 @@
+export declare const conjunctions: readonly ['and', 'or'];
+export type Conjunction = (typeof conjunctions)[number];

package/dist/types/utils/helper/utils.d.ts

@@ -1,3 +1,4 @@
+import { Conjunction } from './utils-types';
 export declare function format(first: string | undefined, middle: string | undefined, last: string | undefined): string;
 export declare function hasMultipleTrueValues<T>(arr: T[], key: keyof T): boolean;
 export declare function extractValuesByKey<T>(objects: T[], key: keyof T): Array<T[keyof T]>;
@@ -20,3 +21,23 @@ export declare function isEmpty(str: string | undefined | null): boolean;
  * @returns {string[]}
  */
 export declare function retrieveEnumKeys(enumObject: object): string[];
+/**
+ * Prints an array as a comma delimited list, with the last element being preceded by a conjunction.
+ * As per ontario.ca content guidelines, there is no Oxford comma.
+ *
+ * @param {Array<any>} arr - The array that you wish to print.
+ * @param {Conjunction} conjunctionType - Whether you want the sentence to end with 'and value.' or 'or value.'
+ *
+ * @returns {string}
+ */
+export declare function printArray(arr: Array<any>, conjunctionType?: Conjunction): string;
+/**
+ * Grabs the HTML element of the page.
+ *
+ * More targetted than document.documentElement as the documentElement could
+ * in theory be any element that is the top level. e.g. <div> if the page is not
+ * set up to be semantically correct.
+ *
+ * @returns {HTMLElement}
+ */
+export declare function getRootHTMLElement(): HTMLElement;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ongov/ontario-design-system-component-library",
-	"version": "4.3.0",
+	"version": "5.0.0-alpha.1",
 	"private": false,
 	"description": "Ontario Design System Component Library",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"test:unit": "stencil test --spec"
 	},
 	"dependencies": {
-		"@ongov/ontario-design-system-global-styles": "4.3.0",
+		"@ongov/ontario-design-system-global-styles": "4.3.1-alpha.1",
 		"@stencil/core": "^4.12.2",
 		"dotenv": "^16.3.1"
 	},
@@ -102,5 +102,5 @@
 	"collection:main": "dist/collection/index.js",
 	"es2015": "dist/esm/index.mjs",
 	"es2017": "dist/esm/index.mjs",
-	"gitHead": "788db424e1fbcb72a4b9bf8da801da4765ab6154"
+	"gitHead": "2941db5cb66d3a161e359f36543b489922853b02"
 }

package/src/components/ontario-card/ontario-card-types.tsx

@@ -1,9 +1,38 @@
-export const CardTypes = ['basic', 'image', 'title', 'horizontal'] as const;
-export const HeaderTypes = ['default', 'light', 'dark'] as const;
+export const Layouts = ['vertical', 'horizontal'] as const;
 export const HorizontalImagePositionTypes = ['left', 'right'] as const;
 export const HorizontalImageSizeTypes = ['one-fourth', 'one-third'] as const;
 
-export type CardType = (typeof CardTypes)[number];
-export type HeaderType = (typeof HeaderTypes)[number];
+export type Layout = (typeof Layouts)[number];
 export type HorizontalImagePositionType = (typeof HorizontalImagePositionTypes)[number];
 export type HorizontalImageSizeType = (typeof HorizontalImageSizeTypes)[number];
+
+export const HeaderColours = [
+	'dark-accent',
+	'light-accent',
+	'light-gold',
+	'light-yellow',
+	'light-taupe',
+	'light-green',
+	'light-lime',
+	'light-teal',
+	'light-sky',
+	'light-blue',
+	'light-purple',
+	'light-orange',
+	'light-red',
+	'light-magenta',
+	'gold',
+	'yellow',
+	'taupe',
+	'green',
+	'lime',
+	'teal',
+	'sky',
+	'blue',
+	'purple',
+	'orange',
+	'red',
+	'magenta',
+];
+
+export type HeaderColour = (typeof HeaderColours)[number];

package/src/components/ontario-card/ontario-card.scss

@@ -15,7 +15,7 @@
 	border-radius: globalVariables.$global-radius;
 	margin: spacing.$spacing-0 spacing.$spacing-7 spacing.$spacing-7 spacing.$spacing-0;
 	padding: spacing.$spacing-0;
-	/* 
+	/*
 	 * Required for cards to stay the same height regardless of content size.
 	 * Without subtracting the margin-bottom amount the cards will be too large.
 	 */
@@ -47,6 +47,13 @@
 	}
 }
 
+.ontario-card--image-true {
+	margin-top: spacing.$spacing-2 * -1;
+	@at-root .ontario-card__card-type--horizontal & {
+		margin-top: spacing.$spacing-0;
+	}
+}
+
 .ontario-card__card-type--horizontal {
 	display: flex;
 
@@ -60,6 +67,10 @@
 		position: relative;
 	}
 
+	.ontario-card__heading {
+		border-radius: 0;
+	}
+
 	a {
 		&:focus-within {
 			box-shadow: none;
@@ -88,35 +99,18 @@
 	padding: (spacing.$spacing-5 - spacing.$spacing-1) spacing.$spacing-5 spacing.$spacing-2 spacing.$spacing-5;
 	transition: text-decoration 0.3s ease-in-out;
 	background-color: colours.$ontario-colour-white;
+	max-width: none;
 
 	.ontario-card:hover & {
 		text-decoration-line: underline;
 		text-decoration-color: colours.$ontario-colour-black;
 	}
 
-	.ontario-card__header-type--light & {
-		background-color: colours.$ontario-greyscale-5;
-		padding-top: spacing.$spacing-4;
-		padding-bottom: spacing.$spacing-4;
-		padding-right: spacing.$spacing-9;
-		border-radius: globalVariables.$global-radius globalVariables.$global-radius 0 0;
-	}
-
-	.ontario-card__header-type--dark & {
-		background-color: colours.$ontario-colour-black;
-		padding-top: spacing.$spacing-4;
-		padding-bottom: spacing.$spacing-4;
-		border-radius: globalVariables.$global-radius globalVariables.$global-radius 0 0;
-	}
-
-	.ontario-card__header-type--dark:hover & {
-		text-decoration-line: underline;
-		text-decoration-color: colours.$ontario-colour-white;
-	}
-
-	.ontario-card--no-description & {
-		padding: spacing.$spacing-4 spacing.$spacing-5;
-		border-radius: 0 0 globalVariables.$global-radius globalVariables.$global-radius;
+	.ontario-card--image-true & {
+		border-radius: 0;
+		@at-root .ontario-card__card-type--horizontal & {
+			border-radius: 0 globalVariables.$global-radius 0 0;
+		}
 	}
 
 	a {
@@ -124,10 +118,6 @@
 		text-decoration: none;
 		outline: none;
 
-		.ontario-card__header-type--dark & {
-			color: colours.$ontario-colour-white;
-		}
-
 		&::after {
 			content: '';
 			position: absolute;
@@ -153,6 +143,47 @@
 	}
 }
 
+// ontario-card's header colour options
+
+$ontario-card-heading-colours: (
+	'light-accent': colours.$ontario-greyscale-5,
+	'dark-accent': colours.$ontario-colour-black,
+	'light-gold': colours.$ontario-colour-light-gold,
+	'light-yellow': colours.$ontario-colour-light-yellow,
+	'light-taupe': colours.$ontario-colour-light-taupe,
+	'light-green': colours.$ontario-colour-light-green,
+	'light-lime': colours.$ontario-colour-light-lime,
+	'light-teal': colours.$ontario-colour-light-teal,
+	'light-sky': colours.$ontario-colour-light-sky,
+	'light-purple': colours.$ontario-colour-light-purple,
+	'light-orange': colours.$ontario-colour-light-orange,
+	'light-red': colours.$ontario-colour-light-red,
+	'light-magenta': colours.$ontario-colour-light-magenta,
+	'gold': colours.$ontario-colour-gold,
+	'yellow': colours.$ontario-colour-yellow,
+	'taupe': colours.$ontario-colour-taupe,
+	'green': colours.$ontario-colour-green,
+	'lime': colours.$ontario-colour-lime,
+	'teal': colours.$ontario-colour-teal,
+	'sky': colours.$ontario-colour-sky,
+	'purple': colours.$ontario-colour-purple,
+	'orange': colours.$ontario-colour-orange,
+	'red': colours.$ontario-colour-red,
+	'magenta': colours.$ontario-colour-magenta,
+);
+
+@each $colour-name, $colour-value in $ontario-card-heading-colours {
+	.ontario-card__background--#{$colour-name} {
+		background-color: $colour-value;
+	}
+
+	.ontario-card__heading--#{$colour-name} {
+		background-color: $colour-value;
+		padding-top: spacing.$spacing-4;
+		padding-bottom: spacing.$spacing-4;
+	}
+}
+
 .ontario-card__text-container {
 	.ontario-card__card-type--horizontal & {
 		width: 66.6%;
@@ -182,18 +213,8 @@
 		margin-bottom: spacing.$spacing-0;
 	}
 
-	.ontario-card__header-type--light &,
-	.ontario-card__header-type--dark & {
-		padding-top: spacing.$spacing-4;
-	}
-
 	@media screen and (max-width: breakpoints.$medium-breakpoint) {
 		padding: spacing.$spacing-2 spacing.$spacing-4 spacing.$spacing-5 spacing.$spacing-4;
-
-		.ontario-card__header-type--light &,
-		.ontario-card__header-type--dark & {
-			padding-top: spacing.$spacing-4;
-		}
 	}
 }