From e415d091e5e4df70580375aed93bc6a6540d083b Mon Sep 17 00:00:00 2001 From: Yves Gatesoupe Date: Fri, 19 Nov 2021 15:50:22 +0100 Subject: [PATCH] Contract details as modals --- package-lock.json | 5 +++ package.json | 5 +-- src/_includes/layouts/base.njk | 2 ++ src/_includes/layouts/team.njk | 2 +- src/_includes/partials/components/map.njk | 2 +- src/pages/nous-rejoindre.md | 42 +++++++++++++++++++++-- src/scss/_theme.scss | 8 ----- 7 files changed, 52 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd4ac7e3..bbba5fbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -936,6 +936,11 @@ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", "dev": true }, + "bootstrap": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index a9184e45..900a930f 100755 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@11ty/eleventy-plugin-rss": "^1.0.7", "@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3", "@tbranyen/jsdom": "^13.0.0", + "bootstrap": "^5.1.3", "concurrently": "^4.1.2", "copyfiles": "^2.4.1", "html-minifier": "^4.0.0", @@ -38,8 +39,8 @@ "sass:tokens": "npx json-to-scss src/_data/tokens.json src/scss/_tokens.scss", "sass:lint": "npx stylelint src/scss/**/*.scss", "sass:process": "npm run sass:tokens && npm run sass:lint && sass src/scss/global.scss src/_includes/assets/css/global.css --style=compressed", - "vendor:css": "copyfiles node_modules/leaflet/dist/leaflet.css -f dist/vendor/css", - "vendor:js": "copyfiles node_modules/leaflet/dist/leaflet.js -f dist/vendor/js", + "vendor:css": "copyfiles node_modules/leaflet/dist/leaflet.css node_modules/bootstrap/dist/css/bootstrap.min.css -f dist/vendor/css", + "vendor:js": "copyfiles node_modules/leaflet/dist/leaflet.js node_modules/bootstrap/dist/js/bootstrap.min.js -f dist/vendor/js", "vendor": "npm run vendor:css && npm run vendor:js", "start": "concurrently \"npm run vendor\" \"npm run sass:process -- --watch\" \"npm run serve\"", "serve": "cross-env ELEVENTY_ENV=development npx eleventy --serve", diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index 34084719..59f59b6d 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -8,6 +8,7 @@ {% include "partials/global/meta-info.njk" %} + {% block head %} {% endblock %} @@ -20,6 +21,7 @@ {% block foot %} {% endblock %} + diff --git a/src/pages/nous-rejoindre.md b/src/pages/nous-rejoindre.md index 1ba2b51c..72f2165f 100644 --- a/src/pages/nous-rejoindre.md +++ b/src/pages/nous-rejoindre.md @@ -30,7 +30,8 @@ eleventyExcludeFromCollections: true - Ouverture des droits allocation chômage si rémunération - Attention, ce n’est pas un contrat de travail - [Voir le contrat CAPE en détail]() + + Voir le contrat CAPE en détail
@@ -57,7 +58,8 @@ eleventyExcludeFromCollections: true - Ouverture des droits allocation chômage - Mutuelle santé - [Voir le contrat CESA en détail]() + + Voir le contrat CESA en détail Equipage Astrolabe @@ -78,3 +80,39 @@ eleventyExcludeFromCollections: true Petit bateau à voile
+ + + + + + diff --git a/src/scss/_theme.scss b/src/scss/_theme.scss index 9c8e9e29..d948d23e 100644 --- a/src/scss/_theme.scss +++ b/src/scss/_theme.scss @@ -74,14 +74,6 @@ a:not([class]):visited { justify-content: flex-end; } -.mt-1 { - margin-top: 1rem; -} - -.mt-2 { - margin-top: 2rem; -} - .ml-1 { margin-left: 1rem; }