diff --git a/components/card-pricing/card-pricing.twig b/components/card-pricing/card-pricing.twig index 7a486b628da3430d391867580f44173ef6a2f325..08431534c1ef7854220626e3e2a70ae6e31db2a6 100644 --- a/components/card-pricing/card-pricing.twig +++ b/components/card-pricing/card-pricing.twig @@ -21,6 +21,23 @@ }) %} +{% set description_text = + html_cva( + variants: { + promoted: { + no: ['default'], + yes: ['inverted'] + } + } + ) +%} + +{% set description_text_color = + description_text.apply({ + promoted: is_promoted + }) +%} +
{{ @@ -61,7 +78,7 @@ 'mercury:text', { text: text, - text_color: 'default', + text_color: description_text_color, text_size: 'normal' }, with_context: false diff --git a/components/heading/heading.component.yml b/components/heading/heading.component.yml index a0559960bda3a0a9ce019b8c7523f15dc3d94e4a..4108367a7c8f56b0788ed60706de4cc16643b25b 100644 --- a/components/heading/heading.component.yml +++ b/components/heading/heading.component.yml @@ -36,6 +36,7 @@ props: - heading-responsive-xl - heading-responsive-lg meta:enum: + default: Default for heading level heading-responsive-8xl: 8XL heading-responsive-7xl: 7XL heading-responsive-6xl: 6XL diff --git a/components/hero-side-by-side/hero-side-by-side.component.yml b/components/hero-side-by-side/hero-side-by-side.component.yml index d71ddc9c0f890016974af87ca2de4433d16c4f5f..583479fa1e4d0f02537ccbc501fcc9435f7f87bb 100644 --- a/components/hero-side-by-side/hero-side-by-side.component.yml +++ b/components/hero-side-by-side/hero-side-by-side.component.yml @@ -7,6 +7,7 @@ props: required: - padding_block_start - padding_block_end + - justify_content properties: hero_flex_gap: type: string @@ -20,6 +21,20 @@ props: default: large examples: - "large" + justify_content: + type: string + title: Justify content + enum: + - start + - center + - end + meta:enum: + start: Start + center: Center + end: End + default: center + examples: + - "center" hero_flex_direction_mobile: type: string title: Mobile flex direction diff --git a/components/hero-side-by-side/hero-side-by-side.twig b/components/hero-side-by-side/hero-side-by-side.twig index eacdb2411f4e38a69a89f6c18847918d9b893036..2855dffa98a9c0f5d42ff95efd031884151b2bee 100644 --- a/components/hero-side-by-side/hero-side-by-side.twig +++ b/components/hero-side-by-side/hero-side-by-side.twig @@ -63,6 +63,19 @@ ) %} +{% set content = + html_cva( + base: ['flex-1', 'overflow-hidden', 'rounded-none'], + variants: { + justifyContent: { + start: 'justify-start', + center: 'justify-center', + end: 'justify-end' + } + } + ) +%} + {% set hero_classes = hero.apply({ imagePosition: image_position, @@ -85,6 +98,11 @@ imageRadius: image_radius }) %} +{% set content_classes = + content.apply({ + justifyContent: justify_content + }) +%}
{% if background is not empty and background != 'None' %} @@ -104,7 +122,7 @@ } only %} {% endblock %} -
+
{% block hero_content %} {% block hero_slot %} diff --git a/src/theme.css b/src/theme.css index 176e94c809b1f0d5d2e49518fe60c35a80057518..c05980d4660fae4d9bf1db280a0fab5d09445556 100644 --- a/src/theme.css +++ b/src/theme.css @@ -18,7 +18,7 @@ --secondary: oklch(0.9219 0 0); --secondary-foreground: oklch(0.28 0.041 260.329); --muted: oklch(0.967 0.003 264.542); - --muted-foreground: oklch(0.373 0.031 259.733); + --muted-foreground: oklch(0.13 0.043 265.132); --accent: oklch(0.932 0.032 255.585); --accent-foreground: var(--foreground); --destructive: oklch(0.6368 0.2078 25.3313); diff --git a/templates/navigation/breadcrumb.html.twig b/templates/navigation/breadcrumb.html.twig index bb59f6968c933e8ed3988f8fdfb3ca569e11e502..3021280cd0d8afcd468bbdb9370a5604e6ea43b7 100644 --- a/templates/navigation/breadcrumb.html.twig +++ b/templates/navigation/breadcrumb.html.twig @@ -15,7 +15,7 @@