diff --git a/package-lock.json b/package-lock.json index ab6925eda8d5b08c341354f8c3ff6a97b517ce44..110e246e5486138e1b0a6452d152bb52cca33524 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12833,9 +12833,15 @@ } }, "node_modules/terser": { +<<<<<<< HEAD "version": "5.15.0", "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", +======= + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", +>>>>>>> 80c15c250a02642a2b2d88ed1e16fbdcacebf91e "dependencies": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -16374,6 +16380,15 @@ "@jridgewell/trace-mapping": "^0.3.9" } }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/sourcemap-codec": { "version": "1.4.11", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", @@ -23587,9 +23602,15 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "terser": { +<<<<<<< HEAD "version": "5.15.0", "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", +======= + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", +>>>>>>> 80c15c250a02642a2b2d88ed1e16fbdcacebf91e "requires": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", diff --git a/src/components/HomepageFeatures.js b/src/components/HomepageFeatures.js index 7e7c69ac87fc0b77fceb0bb48838e43d24c6fcc2..96d8b931f2b25723a556f451e675f206cc70d317 100644 --- a/src/components/HomepageFeatures.js +++ b/src/components/HomepageFeatures.js @@ -51,6 +51,21 @@ const FeatureList = [ ]; +function Feature({Svg, title, description}) { + return ( + <div className="sectionsReverse row"> + <div className="col col--5 text--center"> + <Svg className="stickers" alt={title} /> + </div> + <div className="col col--5"> + <h3>{title}</h3> + <p>{description}</p> + </div> + </div> + + ); +} + export default function HomepageFeatures() { return ( <section className="sections container" id="features"> diff --git a/src/components/HomepageFeatures.module.css b/src/components/HomepageFeatures.module.css index bc86790c5084520645394e42b577a10cc2095c4e..a424ff7cba5bb7f6281edf72010eca5f7feb66cf 100644 --- a/src/components/HomepageFeatures.module.css +++ b/src/components/HomepageFeatures.module.css @@ -7,7 +7,12 @@ .tabsElement { width: 100%; margin-bottom: 48px; + +} +.title { + font-weight: bold; + padding-bottom: 40px; } .tabsElement>li { diff --git a/src/components/HomepageResults.js b/src/components/HomepageResults.js index 0ec7590ba3f061838a041f8415920f97070edf1d..c2438686540b3bc1d89a27c55c3bd4070c1b9ca5 100644 --- a/src/components/HomepageResults.js +++ b/src/components/HomepageResults.js @@ -3,7 +3,8 @@ import styles from "./HomepageResults.module.css"; const ResultsList = [ { - title: "Alliez compétitivité et respect de l’environnement", + title: "Alliez compétitivité et respect de l’environnement", + img: "/img/results/light-bulb.png", description: ( <> Froggit est pensé pour ceux qui regardent vers l'avenir et choisissent des solutions robustes, responsables, qui durent dans le temps. diff --git a/src/css/custom.css b/src/css/custom.css index 0e40f7245ca93cdcda23b8320913b75d8144550b..91bfa28c89c4d26047fbf82f34a79db3a3285be0 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -149,6 +149,12 @@ ul { flex-direction: row-reverse; } +.stickers { + height: 275px; + width: 275px; + max-width: 100%; +} + /******* ADMONITIONS *******/ .admonition a { color: var(--ifm-color-white); diff --git a/src/pages/mentions_legales.md b/src/pages/mentions_legales.md index b94c90b6f20d0c86e97caa760a8876f20080a4fb..0231670d41ce0110fdc8a6b8718d9d68f001ea1c 100644 --- a/src/pages/mentions_legales.md +++ b/src/pages/mentions_legales.md @@ -74,10 +74,13 @@ Le code source du site est disponible sur [ce dépôt FroggitðŸ¸](https://lab.f ### Icônes et images +- **Kermit :** conçues par [stickerfolio](https://www.flaticon.com/authors/stickerfolio) sur [Flaticon](https://www.flaticon.com/stickers-pack/frog). - **Sûr :** conçues par [Freepik](https://www.freepik.com) sur [Flaticon](https://www.flaticon.com/fr/icone-gratuite/bouclier_1384580). - **Souverain :** conçues par [Becris](https://www.flaticon.com/fr/auteurs/becris) sur [Flaticon](https://www.flaticon.com/fr/icone-gratuite/rgpd_3202690). - **Libre :** conçues par [Freepik](https://www.freepik.com) sur [Flaticon](https://www.flaticon.com/fr/icone-gratuite/liberte_2284958). -- **Kermit :** conçues par [stickerfolio](https://www.flaticon.com/authors/stickerfolio) sur [Flaticon](https://www.flaticon.com/stickers-pack/frog). +- **Ecology stickers :** conçues par [paulalee](https://www.flaticon.com/authors/paulalee) sur [Flaticon](https://www.flaticon.com/free-stickers/ecology) +- **Great Job stickers :** conçues par [paulalee](https://www.flaticon.com/authors/paulalee) sur [Flaticon](https://www.flaticon.com/stickers-pack/great-job-1) +great-job.png :::note Sources [Lydra dépôt git Legal version 1.0.0](https://gitlab.com/lydra/legal/-/blob/1.0.0/mentions_legales.md) diff --git a/static/img/results/great-job.png b/static/img/results/great-job.png new file mode 100644 index 0000000000000000000000000000000000000000..499717fa43172b93fa84830f01e614f2f0312bd8 Binary files /dev/null and b/static/img/results/great-job.png differ diff --git a/static/img/results/light-bulb.png b/static/img/results/light-bulb.png new file mode 100644 index 0000000000000000000000000000000000000000..0a4a45a17cf4527dfb945228ec182180a100e182 Binary files /dev/null and b/static/img/results/light-bulb.png differ