Resolve conflicts (89130878) · Commits · Issue forks / mercury-3587010

build/main.min.css

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

components/card-icon/card-icon.component.yml

+13 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ props:
		square: Square
		"4:3": Rectangle 4 × 3
		"16:9": Rectangle 16 × 9
		examples:
		- square
		background_color:
		type: string
		title: Background color
		@@ -28,11 +26,13 @@ props:
		- secondary
		- accent
		- muted
		- background
		meta:enum:
		primary: Primary
		secondary: Secondary
		accent: Accent
		muted: Muted
		background: Background
		border_radius:
		type: string
		title: Border radius
		@@ -83,6 +83,17 @@ props:
		default: center
		examples:
		- center
		icon_style:
		type: string
		title: Icon style
		enum:
		- primary
		- primary_background
		- secondary_background
		meta:enum:
		primary: Primary
		primary_background: Primary with background
		secondary_background: Secondary with background
		url:
		type: string
		title: Link

components/card-icon/card-icon.twig

+42 −17

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@

		{% set tile =
		html_cva(
		base: ['relative p-6 md:p-8'],
		base: ['@container relative p-6 md:p-8'],
		variants: {
		hasUrl: {
		yes: 'group cursor-pointer hover:scale-103',
		@@ -10,6 +10,7 @@
		},
		backgroundColor: {
		primary: 'bg-primary text-primary-foreground transition duration-300 hover:bg-primary/80',
		background: 'border border-border bg-background text-foreground hover:bg-background/90 hover:text-foreground/90',
		secondary: 'bg-secondary text-secondary-foreground transition duration-300 hover:bg-secondary/80',
		accent: 'bg-accent text-accent-foreground transition duration-300 hover:bg-accent/80',
		muted: 'bg-muted text-muted-foreground transition duration-300 hover:bg-muted/80',
		@@ -59,6 +60,25 @@
		})
		%}

		{% set icon_style_attr =
		html_cva(
		base: [''],
		variants: {
		iconStyle: {
		primary: 'text-primary',
		primary_background: 'rounded-md bg-accent p-2 text-primary',
		secondary_background: 'rounded-md bg-muted p-2 text-muted-foreground'
		}
		}
		)
		%}

		{% set icon_style_classes =
		icon_style_attr.apply({
		iconStyle: icon_style
		})
		%}

		{% set icon_size_map = {
		small: 'small',
		medium: 'medium',
		@@ -85,9 +105,13 @@
		})
		%}

		{% set heading_classes = ['text-2xl font-semibold @sm:text-3xl @2xl:text-4xl'] %}
		{% set description_classes = ['mt-3 font-body text-md @sm:text-lg @2xl:text-xl'] %}

		<div class="{{ tile_classes }}">
		<div class="flex h-full flex-col justify-center">
		<div class="{{ icon_container_classes }}">
		<div class="{{ icon_style_classes }}">
		{% if icon %}
		{{
		include(
		@@ -101,25 +125,26 @@
		}}
		{% endif %}
		</div>
		</div>

		<div class="{{ text_container_classes }}">
		{% if text is not empty or description is not empty %}
		{% if url is not empty %}
		<a href="{{ url }}" class="flex w-full flex-col before:absolute before:inset-0 before:content-['']">
		{% if text is not empty %}
		<h3>{{ text }}</h3>
		<h3 class="{{ heading_classes\|join(' ') }}">{{ text }}</h3>
		{% endif %}
		{% if description is not empty %}
		<span class="mt-3">{{ description }}</span>
		<span class="{{ description_classes\|join(' ') }}">{{ description }}</span>
		{% endif %}
		</a>
		{% else %}
		<span class="flex w-full flex-col before:absolute before:inset-0 before:content-['']">
		{% if text is not empty %}
		<h3>{{ text }}</h3>
		<h3 class="{{ heading_classes\|join(' ') }}">{{ text }}</h3>
		{% endif %}
		{% if description is not empty %}
		<span class="mt-3">{{ description }}</span>
		<span class="{{ description_classes\|join(' ') }}">{{ description }}</span>
		{% endif %}
		</span>
		{% endif %}

components/card-pricing/card-pricing.twig

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		)
		}}

		<p class="text-lg leading-[1.2]">
		<p class="font-body text-lg leading-[1.2]">
		{{ description }}
		</p>
		</header>

components/card/card.component.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,13 @@ props:
		- accent
		- primary
		- inverted
		- background
		meta:enum:
		default: Default
		accent: Accent
		primary: Primary
		inverted: Inverted
		background: Background
		examples:
		- default
		style: