@gouvfr/dsfr-roller 1.0.25 → 1.0.27

package/src/style/main/utility/_global.scss

@@ -0,0 +1,64 @@
+:root {
+  --block-spacing: 1.5rem;
+}
+
+.fr-container {
+  img {
+    max-width: 100%;
+    height: auto;
+  }
+
+  dl,
+  ol,
+  ul {
+    margin-block-end: var(--block-spacing);
+
+    dl,
+    ol,
+    ul {
+      margin-block-end: var(--xl-block);
+    }
+  }
+
+  :not(.fr-callout) > p {
+    & + {
+      dl,
+      ol,
+      ul {
+        margin-top: -1rem;
+      }
+    }
+  }
+
+  .fr-accordion {
+    margin-bottom: var(--block-spacing);
+
+    & + .fr-accordion {
+      margin-top: calc(var(--block-spacing) * -1);
+    }
+  }
+
+  // .fr-sr-only attributes
+  .fr-sidemenu {
+    &__title {
+      clip: rect(0, 0, 0, 0);
+      height: 1px;
+      margin: -1px;
+      overflow: hidden;
+      padding: 0;
+      position: absolute;
+      white-space: nowrap;
+      width: 1px;
+      border: 0;
+      display: block;
+    }
+  }
+
+  pre code.hljs {
+    border-radius: 0;
+  }
+}
+
+.fr-footer {
+  margin-top: var(--block-spacing);
+}

package/src/style/main/utility/_index.scss

@@ -1,3 +1,4 @@
+@use 'global';
 @use 'font';
 @use 'dsfr-doc-code';
 @use 'icon';

package/src/template/templates/editorial-template.js

@@ -2,14 +2,19 @@ import { Template } from '../template.js';
 import { Sidemenu } from '../../component/components/sidemenu.js';
 import { Breadcrumb } from '../../component/components/breadcrumb.js';
 import { TOC } from '../../page/body/toc.js';
+import { Edit } from '../../component/components/edit.js';
 
 class EditorialTemplate extends Template {
   constructor (data) {
     super(data);
 
     this._hasSidemenu = data?.resource?.navigation?.sidemenu !== undefined;
+    
+    this._hasEditUrl = data?.editUrl !== undefined;
 
-    if (this._hasSidemenu) this._sidemenu = new Sidemenu(data.resource.navigation.sidemenu);
+    if (this._hasSidemenu) this._sidemenu = new Sidemenu(data.resource.navigation.sidemenu, data.resource.badge);
+
+    if (this._hasEditUrl) this._edit = new Edit({...data.resource.edit, editUrl: data.editUrl, blankLabel: this.data.fragments.blank});
 
     this._breadcrumb = new Breadcrumb(data.breadcrumb);
 
@@ -20,7 +25,7 @@ class EditorialTemplate extends Template {
     const cols = [];
     if (this._hasSidemenu) {
       cols.push(`
-                <div class="fr-col-12 fr-col-md-4">
+                <div class="fr-col-12 fr-col-md-4 fr-pt-12v">
                     ${await this._sidemenu.render()}
                 </div>
             `);
@@ -31,6 +36,7 @@ class EditorialTemplate extends Template {
                     ${await this._breadcrumb.render()}
                     ${await this._toc.render()}
                     ${await super.render()}
+                    ${await this._edit.render()}
                 </div>
             `);
 

package/src/template/templates/search-template.js

@@ -13,7 +13,7 @@ class SearchTemplate extends Template {
                   <div id="results-page--container" class="fr-col-12 fr-col-md-8">
                     <section class="dsfr-doc-search-page--head fr-mt-17v">
                       <h1>${this.data.title}</h1>
-                      <p id="results-count" class="fr-h5" role="status"></p>
+                      <p id="results-count" class="fr-h5"></p>
                     </section>
                   </div>
                 </div>