From 9c82fee39699c8c1bf26a248272d9f412a67eae8 Mon Sep 17 00:00:00 2001
From: "Baptiste.z" <zellerbaptiste@gmail.com>
Date: Mon, 28 Aug 2023 11:54:28 +0200
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20fix(consent):=20coche=20les?=
 =?UTF-8?q?=20cookies=20obligatoires=20par=20defaut=20[DS-3524]=20(#735)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Les cookies obligatoires doivent être systématiquement cochés
---
 src/component/consent/example/sample/modal/body.ejs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/component/consent/example/sample/modal/body.ejs b/src/component/consent/example/sample/modal/body.ejs
index 50edd9a53..e23fa82e5 100755
--- a/src/component/consent/example/sample/modal/body.ejs
+++ b/src/component/consent/example/sample/modal/body.ejs
@@ -45,12 +45,14 @@ function getRadios (id, itemId, type) {
   let elementAccept = type === 'all' ? {label: 'Tout accepter'} : { label : 'Accepter'};
   let elementRefuse = type === 'all' ? {label: 'Tout refuser'} : { label : 'Refuser'};
   let disabled = type === 'mandatory';
+  let checked = type === 'mandatory';
 
   return [
     {
       name: id + '-' + name,
       ...elementAccept,
       id: id + '-' + name + '-accept',
+      checked: checked
     },
     {
       name: id + '-' + name,

From 0db05a04ba4907a674472dd22efb666a13a9dc50 Mon Sep 17 00:00:00 2001
From: zellerbaptiste <zellerbaptiste@gmail.com>
Date: Mon, 11 Sep 2023 14:53:05 +0200
Subject: [PATCH 2/4] fix(mega-menu): correctifs de style

---
 src/component/navigation/style/module/_mega-menu.scss | 5 +++++
 src/component/navigation/style/scheme/_default.scss   | 2 +-
 src/component/navigation/template/ejs/leader.ejs      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/component/navigation/style/module/_mega-menu.scss b/src/component/navigation/style/module/_mega-menu.scss
index a096b6073..49760a14d 100644
--- a/src/component/navigation/style/module/_mega-menu.scss
+++ b/src/component/navigation/style/module/_mega-menu.scss
@@ -46,10 +46,15 @@
 
   &__leader {
     @include enable-underline;
+    @include margin-top(-5v, lg);
     @include padding-top(2v);
     @include padding-top(0, lg);
     @include set-text-margin(0 0 2v);
     @include set-title-margin(0 0 2v);
+
+    & > p {
+      @include text-style(sm);
+    }
   }
 
   &__category {
diff --git a/src/component/navigation/style/scheme/_default.scss b/src/component/navigation/style/scheme/_default.scss
index a1ed00799..a3e793e73 100644
--- a/src/component/navigation/style/scheme/_default.scss
+++ b/src/component/navigation/style/scheme/_default.scss
@@ -22,7 +22,7 @@
     &__btn {
       &[aria-expanded="true"]:not(:disabled) {
         @include color.background(open blue-france, (legacy: $legacy));
-        @include color.text(active blue-france, (legacy: $legacy));
+        @include color.text(action-high blue-france, (legacy: $legacy));
       }
     }
 
diff --git a/src/component/navigation/template/ejs/leader.ejs b/src/component/navigation/template/ejs/leader.ejs
index 53427d4f0..db5566930 100644
--- a/src/component/navigation/template/ejs/leader.ejs
+++ b/src/component/navigation/template/ejs/leader.ejs
@@ -12,7 +12,7 @@
 <% let menu = locals.menu || {}; %>
 <% let leader = menu.leader || {}; %>
 
-<div class="<%= prefix %>-col-12 <%= prefix %>-col-lg-8 <%= prefix %>-col-offset-lg-4--right <%= prefix %>-mb-4v" >
+<div class="<%= prefix %>-col-12 <%= prefix %>-col-lg-8 <%= prefix %>-col-offset-lg-4--right" >
   <div class="<%= prefix %>-mega-menu__leader" >
     <%
     if (leader.title !== undefined) {

From eb767845553a6043688c42ea5bddf5073b2e4472 Mon Sep 17 00:00:00 2001
From: zellerbaptiste <zellerbaptiste@gmail.com>
Date: Wed, 13 Sep 2023 11:55:15 +0200
Subject: [PATCH 3/4] fix(mega-menu): correctifs de style

---
 src/component/navigation/style/module/_mega-menu.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/component/navigation/style/module/_mega-menu.scss b/src/component/navigation/style/module/_mega-menu.scss
index 49760a14d..cf4c29ae8 100644
--- a/src/component/navigation/style/module/_mega-menu.scss
+++ b/src/component/navigation/style/module/_mega-menu.scss
@@ -52,7 +52,8 @@
     @include set-text-margin(0 0 2v);
     @include set-title-margin(0 0 2v);
 
-    & > p {
+    p,
+    #{ns(link)} {
       @include text-style(sm);
     }
   }

From 5832feb317097fd0527df6a89da42ed8e93f3375 Mon Sep 17 00:00:00 2001
From: zellerbaptiste <zellerbaptiste@gmail.com>
Date: Thu, 21 Sep 2023 11:23:27 +0200
Subject: [PATCH 4/4] fix(navigation): utilise la mixin nest-link

---
 src/component/navigation/index.scss                   | 2 ++
 src/component/navigation/style/module/_mega-menu.scss | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/component/navigation/index.scss b/src/component/navigation/index.scss
index 4809c8289..c80ea3754 100644
--- a/src/component/navigation/index.scss
+++ b/src/component/navigation/index.scss
@@ -3,4 +3,6 @@
 /// @group navigation
 ////
 
+@import '../link/index';
+
 @import '../../core/index';
diff --git a/src/component/navigation/style/module/_mega-menu.scss b/src/component/navigation/style/module/_mega-menu.scss
index cf4c29ae8..9cb67e8cd 100644
--- a/src/component/navigation/style/module/_mega-menu.scss
+++ b/src/component/navigation/style/module/_mega-menu.scss
@@ -51,9 +51,9 @@
     @include padding-top(0, lg);
     @include set-text-margin(0 0 2v);
     @include set-title-margin(0 0 2v);
+    @include nest-link(sm, null);
 
-    p,
-    #{ns(link)} {
+    p {
       @include text-style(sm);
     }
   }