Merge branch 'main' into production

codegouvfr · Nov 29, 2023 · 9a556f6 · 9a556f6
2 parents 7299045 + e0efa24
commit 9a556f6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 51 deletions.
diff --git a/_data/documentation.js b/_data/documentation.js
diff --git a/_includes/layouts/bluehats-post.njk b/_includes/layouts/bluehats-post.njk
@@ -5,8 +5,8 @@ layout: layouts/base.njk
   {% if showBreadcrumb %}
     {% include "components/breadcrumb.njk" %}
   {% endif %}
-  <div class="fr-grid-row" data-pagefind-body>
-    <div class="fr-col-12">
+  <div class="fr-grid-row fr-grid-row--center" data-pagefind-body>
+    <div class="fr-col-12 fr-col-md-8">
       {% set tagsUrl = "/bluehats/tags/" %}
       {% include "components/taggroup.njk" %}
       <div class="fr-grid-row">
@@ -30,11 +30,7 @@ layout: layouts/base.njk
         </p>
       {% endif %}
 
-      <div class="fr-grid-row">
-        <div class="fr-col-md-8">
-          {{ content | safe }}
-        </div>
-      </div>
+      {{ content | safe }}
 
       {% if video %}
         <figure class="fr-content-media" role="group">
@@ -55,7 +51,10 @@ layout: layouts/base.njk
           <figcaption class="fr-content-media__caption">Support de présentation</figcaption>
         </figure>
       {% endif %}
-
+    </div>
+  </div>
+  <div class="fr-grid-row">
+    <div class="fr-col-12">
       {% if collections.bluehats_posts %}
         {% set previousPost = collections.bluehats_posts | filterCollectionLang | getPreviousCollectionItem %}
         {% set nextPost = collections.bluehats_posts | filterCollectionLang | getNextCollectionItem %}

diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk
@@ -5,8 +5,8 @@ layout: layouts/base.njk
   {% if showBreadcrumb %}
     {% include "components/breadcrumb.njk" %}
   {% endif %}
-  <div class="fr-grid-row" data-pagefind-body>
-    <div class="fr-col-12">
+  <div class="fr-grid-row fr-grid-row--center" data-pagefind-body>
+    <div class="fr-col-12 fr-col-md-8">
       {% include "components/taggroup.njk" %}
       <div class="fr-grid-row">
         <div class="fr-col-12 fr-col-md-9">
@@ -30,7 +30,10 @@ layout: layouts/base.njk
       {% endif %}
 
       {{ content | safe }}
-
+    </div>
+  </div>
+  <div class="fr-grid-row">
+    <div class="fr-col-12">
       {% if collections.posts %}
         {% set previousPost = collections.posts | filterCollectionLang | getPreviousCollectionItem %}
         {% set nextPost = collections.posts | filterCollectionLang | getNextCollectionItem %}

diff --git a/content/fr/documentation/service-public-logiciels-libres.md b/content/fr/documentation/service-public-logiciels-libres.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
   "homepage": "https://code.gouv.fr/",
   "devDependencies": {
     "@11ty/eleventy": "^2.0.1",
-    "@11ty/eleventy-fetch": "^4.0.0",
     "@11ty/eleventy-img": "^3.1.0",
     "@11ty/eleventy-navigation": "^0.3.5",
     "@11ty/eleventy-plugin-bundle": "^1.0.4",