Merge branch 'main' into gh-pages

codegouvfr · Jan 22, 2024 · 226fe69 · 226fe69
2 parents 3075eb6 + 364c80a
commit 226fe69
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/_includes/components/tile.njk b/_includes/components/tile.njk
@@ -16,10 +16,11 @@
   {% if tile.pictogram %}
     <div class="fr-tile__header">
       <div class="fr-tile__pictogram">
+        {% set pictogramUrl %}/artwork/pictograms/{{ tile.pictogram }}{% endset %}
         <svg aria-hidden="true" class="fr-artwork" viewBox="0 0 80 80" width="80px" height="80px">
-          <use class="fr-artwork-decorative" href="/artwork/pictograms/{{ tile.pictogram }}#artwork-decorative"></use>
-          <use class="fr-artwork-minor" href="/artwork/pictograms/{{ tile.pictogram }}#artwork-minor"></use>
-          <use class="fr-artwork-major" href="/artwork/pictograms/{{ tile.pictogram }}#artwork-major"></use>
+          <use class="fr-artwork-decorative" href="{{ pictogramUrl | htmlBaseUrl }}#artwork-decorative"></use>
+          <use class="fr-artwork-minor" href="{{ pictogramUrl | htmlBaseUrl }}#artwork-minor"></use>
+          <use class="fr-artwork-major" href="{{ pictogramUrl | htmlBaseUrl }}#artwork-major"></use>
         </svg>
       </div>
     </div>

diff --git a/_includes/templates/display.njk b/_includes/templates/display.njk
@@ -24,11 +24,11 @@
                         <svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
                              height="80px" viewBox="0 0 80 80">
                           <use class="fr-artwork-decorative"
-                               xlink:href="{{ "/artwork/light.svg#artwork-decorative" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/light.svg" | htmlBaseUrl }}#artwork-decorative"></use>
                           <use class="fr-artwork-minor"
-                               xlink:href="{{ "/artwork/light.svg#artwork-minor" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/light.svg" | htmlBaseUrl }}#artwork-minor"></use>
                           <use class="fr-artwork-major"
-                               xlink:href="{{ "/artwork/light.svg#artwork-major" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/light.svg" | htmlBaseUrl }}#artwork-major"></use>
                         </svg>
                       </div>
                     </div>
@@ -39,11 +39,11 @@
                         <svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
                              height="80px" viewBox="0 0 80 80">
                           <use class="fr-artwork-decorative"
-                               xlink:href="{{ "/artwork/dark.svg#artwork-decorative" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/dark.svg" | htmlBaseUrl }}#artwork-decorative"></use>
                           <use class="fr-artwork-minor"
-                               xlink:href="{{ "/artwork/dark.svg#artwork-minor" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/dark.svg" | htmlBaseUrl }}#artwork-minor"></use>
                           <use class="fr-artwork-major"
-                               xlink:href="{{ "/artwork/dark.svg#artwork-major" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/dark.svg" | htmlBaseUrl }}#artwork-major"></use>
                         </svg>
                       </div>
                     </div>
@@ -57,11 +57,11 @@
                         <svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
                              height="80px" viewBox="0 0 80 80">
                           <use class="fr-artwork-decorative"
-                               xlink:href="{{ "/artwork/system.svg#artwork-decorative" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/system.svg" | htmlBaseUrl }}#artwork-decorative"></use>
                           <use class="fr-artwork-minor"
-                               xlink:href="{{ "/artwork/system.svg#artwork-minor" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/system.svg" | htmlBaseUrl }}#artwork-minor"></use>
                           <use class="fr-artwork-major"
-                               xlink:href="{{ "/artwork/system.svg#artwork-major" | htmlBaseUrl }}"></use>
+                               xlink:href="{{ "/artwork/system.svg" | htmlBaseUrl }}#artwork-major"></use>
                         </svg>
                       </div>
                     </div>

diff --git a/content/404.njk b/content/404.njk
@@ -33,13 +33,13 @@ eleventyExcludeFromCollections: true
     <div class="fr-col-12 fr-col-md-3 fr-col-offset-md-1 fr-px-6w fr-px-md-0 fr-py-0">
       <svg xmlns="http://www.w3.org/2000/svg" class="fr-responsive-img fr-artwork" aria-hidden="true" width="160"
            height="200" viewBox="0 0 160 200">
-        <use class="fr-artwork-motif" href="/artwork/background/ovoid.svg#artwork-motif"></use>
-        <use class="fr-artwork-background" href="/artwork/background/ovoid.svg#artwork-background"></use>
+        <use class="fr-artwork-motif" href="{{ "/artwork/background/ovoid.svg" | htmlBaseUrl }}#artwork-motif"></use>
+        <use class="fr-artwork-background" href="{{ "/artwork/background/ovoid.svg" | htmlBaseUrl }}#artwork-background"></use>
         <g transform="translate(40, 60)">
           <use class="fr-artwork-decorative"
-               href="/artwork/pictograms/system/technical-error.svg#artwork-decorative"></use>
-          <use class="fr-artwork-minor" href="/artwork/pictograms/system/technical-error.svg#artwork-minor"></use>
-          <use class="fr-artwork-major" href="/artwork/pictograms/system/technical-error.svg#artwork-major"></use>
+               href="{{ "/artwork/pictograms/system/technical-error.svg" | htmlBaseUrl }}#artwork-decorative"></use>
+          <use class="fr-artwork-minor" href="{{ "/artwork/pictograms/system/technical-error.svg" | htmlBaseUrl }}#artwork-minor"></use>
+          <use class="fr-artwork-major" href="{{ "/artwork/pictograms/system/technical-error.svg" | htmlBaseUrl }}#artwork-major"></use>
         </g>
       </svg>
     </div>