fix: 🐛 resolve conflicts
This commit is contained in:
parent
c3c3af0b03
commit
f2a59d8356
5 changed files with 33 additions and 9 deletions
BIN
resources/assets/images/pictos/sablier.png
Normal file
BIN
resources/assets/images/pictos/sablier.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.2 KiB |
BIN
resources/assets/images/pictos/validé.png
Normal file
BIN
resources/assets/images/pictos/validé.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
|
|
@ -36,6 +36,7 @@
|
|||
--preventive-foreground: 210 40% 98%;
|
||||
--ring: 222.2 84% 4.9%;
|
||||
--radius: 0.5rem;
|
||||
--validated: 96 43% 16%;
|
||||
}
|
||||
|
||||
body {
|
||||
|
|
|
|||
|
|
@ -10,9 +10,11 @@ import LabelSlider from "@/front/Components/Theme/LabelSlider";
|
|||
import { GetTranslation } from "@/lib/utils";
|
||||
import str from "@/hooks/use-string";
|
||||
import CarouselSection from "../Components/Theme/Sections/CarouselSection";
|
||||
import { bgColors } from "../lib/constants";
|
||||
import { bgColors, imageShapes } from "../lib/constants";
|
||||
import { usePeekCarouselOptions } from "../lib/carousels";
|
||||
import { Separator } from "@/components/ui/separator";
|
||||
import Hourglass from "&/images/pictos/sablier.png";
|
||||
import Validated from "&/images/pictos/validé.png";
|
||||
|
||||
export default function Expertise() {
|
||||
return (
|
||||
|
|
@ -91,14 +93,34 @@ export default function Expertise() {
|
|||
répartis en 3 chapitres principaux : bien-être animal, biosécurité
|
||||
et visitabilité.
|
||||
</p>
|
||||
<p className="text-3xl uppercase text-primary font-semibold">
|
||||
En 2025, nous avons tenu notre engagement de proposer des
|
||||
solutions en élevage alternatif sur la totalité de nos gammes.
|
||||
</p>
|
||||
<p className="text-3xl uppercase text-primary font-semibold">
|
||||
En 2026, nous nous engageons à proposer uniquement des solutions
|
||||
en élevage alternatif à marque Ovoteam.
|
||||
</p>
|
||||
<div className="flex md:flex-row flex-col items-center gap-3 text-validated">
|
||||
<Image
|
||||
size="w-36 md:w-96 h-auto"
|
||||
shape={imageShapes.SQUARE}
|
||||
image={{
|
||||
alt: 'Icône "validé" pour Engagement 2025 Ovoteam',
|
||||
src: Validated,
|
||||
title: "Validé"
|
||||
}} />
|
||||
<p className="text-3xl uppercase font-semibold">
|
||||
En 2025, nous avons tenu notre engagement de proposer des
|
||||
solutions en élevage alternatif sur la totalité de nos gammes.
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex md:flex-row flex-col items-center gap-3">
|
||||
<Image
|
||||
size="w-36 md:w-96 h-auto"
|
||||
shape={imageShapes.SQUARE}
|
||||
image={{
|
||||
alt: 'Icône "sablier" pour Engagement 2027 Ovoteam',
|
||||
src: Hourglass,
|
||||
title: "Sablier"
|
||||
}} />
|
||||
<p className="text-3xl uppercase text-primary font-semibold">
|
||||
Au 1er janvier 2027, nous nous engageons à proposer uniquement des solutions
|
||||
en élevage alternatif à marque Ovoteam.
|
||||
</p>
|
||||
</div>
|
||||
<p className="text-3xl uppercase text-primary font-semibold">
|
||||
En 2030, nous nous engageons à atteindre 90% de nos volumes vendus
|
||||
en œufs issus d'élevages alternatifs.
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ export default {
|
|||
colors: {
|
||||
background: 'hsl(var(--background))',
|
||||
foreground: 'hsl(var(--foreground))',
|
||||
validated: 'hsl(var(--validated))',
|
||||
card: {
|
||||
DEFAULT: 'hsl(var(--card))',
|
||||
foreground: 'hsl(var(--card-foreground))'
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue