meetup filters

config/sync/structure_sync.data.yml

@@ -1,78 +1,23 @@
 blocks:
   -
-    info: 'Create meetup offre'
+    info: 'Logo gouv'
     langcode: fr
-    uuid: 5481d094-4cf9-48ba-a535-079c96eeba26
+    uuid: 284bfddc-42a2-4268-ab22-b22cd0014e59
-    bundle: link
-    revision_id: null
-    rev_id_current: null
-    fields:
-      field_lien_libele:
-        -
-          uri: 'internal:/user/login-register?destination=/node/add/offre'
-          title: 'Déposer mon offre'
-          options: {  }
-  -
-    info: "Votre question n'éxiste pas ?"
-    langcode: fr
-    uuid: 40c00cc4-49aa-41f8-b27c-3545c6be2982
-    bundle: link
-    revision_id: null
-    rev_id_current: null
-    fields:
-      field_lien_libele:
-        -
-          uri: 'internal:/form/poser-une-question'
-          title: "N'hésitez pas à nous la poser, nous tenterons d'y répondre."
-          options: {  }
-  -
-    info: 'Une question ?'
-    langcode: fr
-    uuid: 82c97cc5-9a38-42e6-852f-e160d945a338
-    bundle: link
-    revision_id: null
-    rev_id_current: null
-    fields:
-      field_lien_libele:
-        -
-          uri: 'internal:/faq-page'
-          title: 'Trouvez votre réponse sur la foire aux questions.'
-          options: {  }
-  -
-    info: 'logo epau'
-    langcode: fr
-    uuid: 3276aaec-886f-4368-a08e-002f8e90e274
     bundle: logo_link
     revision_id: null
     rev_id_current: null
     fields:
       field_lien:
         -
-          uri: 'https://epau.archi.fr'
+          uri: 'internal:/'
           title: ''
           options: {  }
       field_logo:
         -
-          target_id: '8'
+          target_id: '148'
-          alt: 'Logo EPAU'
+          alt: 'Logo république'
           title: ''
-          width: '725'
+          width: '686'
-          height: '106'
-  -
-    info: 'logo rep'
-    langcode: fr
-    uuid: e08fbafe-5787-4aba-8a5f-c3996085bce6
-    bundle: logo_link
-    revision_id: null
-    rev_id_current: null
-    fields:
-      field_lien: {  }
-      field_logo:
-        -
-          target_id: '7'
-          alt: 'République française'
-          title: ''
-          width: '665'
           height: '600'
   -
     info: 'Logo erable'
@@ -95,54 +40,93 @@ blocks:
           width: '800'
           height: '408'
   -
-    info: 'Logo gouv'
+    info: 'logo rep'
     langcode: fr
-    uuid: 284bfddc-42a2-4268-ab22-b22cd0014e59
+    uuid: e08fbafe-5787-4aba-8a5f-c3996085bce6
+    bundle: logo_link
+    revision_id: null
+    rev_id_current: null
+    fields:
+      field_lien: {  }
+      field_logo:
+        -
+          target_id: '7'
+          alt: 'République française'
+          title: ''
+          width: '665'
+          height: '600'
+  -
+    info: 'logo epau'
+    langcode: fr
+    uuid: 3276aaec-886f-4368-a08e-002f8e90e274
     bundle: logo_link
     revision_id: null
     rev_id_current: null
     fields:
       field_lien:
         -
-          uri: 'internal:/'
+          uri: 'https://epau.archi.fr'
           title: ''
           options: {  }
       field_logo:
         -
-          target_id: '148'
+          target_id: '8'
-          alt: 'Logo république'
+          alt: 'Logo EPAU'
           title: ''
-          width: '686'
+          width: '725'
-          height: '600'
+          height: '106'
+  -
+    info: 'Une question ?'
+    langcode: fr
+    uuid: 82c97cc5-9a38-42e6-852f-e160d945a338
+    bundle: link
+    revision_id: null
+    rev_id_current: null
+    fields:
+      field_lien_libele:
+        -
+          uri: 'internal:/faq-page'
+          title: 'Trouvez votre réponse sur la foire aux questions.'
+          options: {  }
+  -
+    info: "Votre question n'éxiste pas ?"
+    langcode: fr
+    uuid: 40c00cc4-49aa-41f8-b27c-3545c6be2982
+    bundle: link
+    revision_id: null
+    rev_id_current: null
+    fields:
+      field_lien_libele:
+        -
+          uri: 'internal:/form/poser-une-question'
+          title: "N'hésitez pas à nous la poser, nous tenterons d'y répondre."
+          options: {  }
+  -
+    info: 'Create meetup offre'
+    langcode: fr
+    uuid: 5481d094-4cf9-48ba-a535-079c96eeba26
+    bundle: link
+    revision_id: null
+    rev_id_current: null
+    fields:
+      field_lien_libele:
+        -
+          uri: 'internal:/user/login-register?destination=/node/add/offre'
+          title: 'Déposer mon offre'
+          options: {  }
 menus:
   -
-    menu_name: footer
+    menu_name: main
-    title: 'Mentions légales'
+    title: Présentation
     parent: null
-    uri: 'entity:node/6'
+    uri: 'internal:/node/1'
     link_title: ''
     description: null
     enabled: true
     expanded: false
-    weight: -49
+    weight: -50
     langcode: fr
-    uuid: 8f7f8a69-bcfd-4059-9a0e-e665ead0efa6
+    uuid: 7be29ab1-7d6f-4c78-9374-d2966388dbd5
-    options:
-      attributes:
-        class:
-          - ''
-  -
-    menu_name: footer
-    title: Contacts
-    parent: null
-    uri: 'entity:node/5'
-    link_title: ''
-    description: null
-    enabled: true
-    expanded: false
-    weight: -48
-    langcode: fr
-    uuid: 8c3c093c-8015-4ee3-8f19-96cb6554f8e5
     options:
       attributes:
         class:
@@ -211,6 +195,22 @@ menus:
       attributes:
         class:
           - ''
+  -
+    menu_name: main
+    title: 'Consultation de recherche'
+    parent: null
+    uri: 'internal:/node/2'
+    link_title: ''
+    description: null
+    enabled: true
+    expanded: false
+    weight: -49
+    langcode: fr
+    uuid: bb6c3e72-1ff8-4b65-806b-a72132c5cb97
+    options:
+      attributes:
+        class:
+          - ''
   -
     menu_name: header
     title: Gouvernance
@@ -227,6 +227,38 @@ menus:
       attributes:
         class:
           - ''
+  -
+    menu_name: main
+    title: Gouvernance
+    parent: null
+    uri: 'internal:/gouvernance'
+    link_title: ''
+    description: null
+    enabled: true
+    expanded: false
+    weight: 0
+    langcode: fr
+    uuid: 9940959e-e443-4783-8b24-b863a2d56edd
+    options:
+      attributes:
+        class:
+          - ''
+  -
+    menu_name: main
+    title: Partenaires
+    parent: null
+    uri: 'internal:/partenaires'
+    link_title: ''
+    description: null
+    enabled: true
+    expanded: false
+    weight: 0
+    langcode: fr
+    uuid: fd02840b-282a-4acb-8f19-b22e0215e967
+    options:
+      attributes:
+        class:
+          - ''
   -
     menu_name: header
     title: Partenaires
@@ -276,65 +308,33 @@ menus:
         class:
           - ''
   -
-    menu_name: main
+    menu_name: footer
-    title: Présentation
+    title: 'Mentions légales'
     parent: null
-    uri: 'internal:/node/1'
+    uri: 'entity:node/6'
-    link_title: ''
-    description: null
-    enabled: true
-    expanded: false
-    weight: -50
-    langcode: fr
-    uuid: 7be29ab1-7d6f-4c78-9374-d2966388dbd5
-    options:
-      attributes:
-        class:
-          - ''
-  -
-    menu_name: main
-    title: 'Consultation de recherche'
-    parent: null
-    uri: 'internal:/node/2'
     link_title: ''
     description: null
     enabled: true
     expanded: false
     weight: -49
     langcode: fr
-    uuid: bb6c3e72-1ff8-4b65-806b-a72132c5cb97
+    uuid: 8f7f8a69-bcfd-4059-9a0e-e665ead0efa6
     options:
       attributes:
         class:
           - ''
   -
-    menu_name: main
+    menu_name: footer
-    title: Gouvernance
+    title: Contacts
     parent: null
-    uri: 'internal:/gouvernance'
+    uri: 'entity:node/5'
     link_title: ''
     description: null
     enabled: true
     expanded: false
-    weight: 0
+    weight: -48
     langcode: fr
-    uuid: 9940959e-e443-4783-8b24-b863a2d56edd
+    uuid: 8c3c093c-8015-4ee3-8f19-96cb6554f8e5
-    options:
-      attributes:
-        class:
-          - ''
-  -
-    menu_name: main
-    title: Partenaires
-    parent: null
-    uri: 'internal:/partenaires'
-    link_title: ''
-    description: null
-    enabled: true
-    expanded: false
-    weight: 0
-    langcode: fr
-    uuid: fd02840b-282a-4acb-8f19-b22e0215e967
     options:
       attributes:
         class:
@@ -397,3 +397,44 @@ taxonomies:
       weight: '0'
       parent: '0'
       uuid: ed39f8b1-5df1-400e-aa05-d832c98e83f8
+  type_dactus:
+    -
+      vid: type_dactus
+      tid: '1'
+      langcode: fr
+      name: Événement
+      description__value: null
+      description__format: null
+      weight: '0'
+      parent: '0'
+      uuid: a34a94d4-831f-4b18-b06b-339348d4f418
+    -
+      vid: type_dactus
+      tid: '3'
+      langcode: fr
+      name: Presse
+      description__value: null
+      description__format: null
+      weight: '0'
+      parent: '0'
+      uuid: fb813155-5c3f-47ee-ae74-e612aebadd32
+    -
+      vid: type_dactus
+      tid: '4'
+      langcode: fr
+      name: Publication
+      description__value: null
+      description__format: null
+      weight: '0'
+      parent: '0'
+      uuid: 1bd89ac3-8b26-4a65-97f2-681f62e9c99e
+    -
+      vid: type_dactus
+      tid: '2'
+      langcode: fr
+      name: Spectacle
+      description__value: null
+      description__format: null
+      weight: '0'
+      parent: '0'
+      uuid: ef3082e0-ff44-4e94-9ded-8e8da78f180a

config/sync/views.view.faq.yml

@@ -1,6 +1,6 @@
 uuid: ff723a50-d198-486b-bce1-9a9add9f6723
 langcode: fr
-status: true
+status: false
 dependencies:
   config:
     - core.entity_view_mode.node.full

config/sync/views.view.meetup.yml

@@ -5,11 +5,13 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - node.type.offre
+    - taxonomy.vocabulary.structure
   content:
     - 'block_content:link:5481d094-4cf9-48ba-a535-079c96eeba26'
     - 'config_pages:meetup:515490b3-706e-4c22-a81c-e74d281adf66'
   module:
     - node
+    - taxonomy
     - user
 id: meetup
 label: Meetup
@@ -163,6 +165,63 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+        field_structure_target_id:
+          id: field_structure_target_id
+          table: node__field_structure
+          field: field_structure_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: taxonomy_index_tid
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_structure_target_id_op
+            label: Structure
+            description: ''
+            use_operator: false
+            operator: field_structure_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_structure_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              editor: '0'
+              candidat: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          vid: structure
+          type: select
+          hierarchy: false
+          limit: true
+          error_message: true
+          save_lineage: false
+          force_deepest: false
+          parent: null
+          level_labels: ''
+          hierarchy_depth: 0
+          required_depth: 0
+          none_label: '- Please select -'
       style:
         type: default
       row:
@@ -213,6 +272,8 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags: {  }
@@ -229,6 +290,8 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags: {  }

web/themes/erabletheme/css/styles.css

@@ -46,13 +46,18 @@ a {
   text-decoration: none;
 }
 
-main[role=main] {
+/* main[role="main"] {
     margin-top: 10vh;
-}
+    @media (min-width: $breakpoint_desktop) {
-@media (min-width: 1080px) {
-  main[role=main] {
         margin-top: calc(10vh + 3rem);
     }
+} */
+body {
+  overflow-x: hidden;
+}
+
+.layout-container {
+  margin: 0 !important;
 }
 
 strong {
@@ -77,21 +82,16 @@ body.toolbar-fixed header[role=banner] {
   top: 2.4em !important;
 }
 
-.layout-container {
-  width: 100%;
-  overflow: hidden;
-}
 .layout-container header[role=banner] {
   width: 100%;
   background: white;
-  position: fixed;
-  top: 0;
-  left: 0;
   z-index: 99;
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.2);
 }
 @media (min-width: 1080px) {
   .layout-container header[role=banner] {
+    position: sticky;
+    top: -12vh;
     box-shadow: none;
   }
 }
@@ -100,7 +100,7 @@ body.toolbar-fixed header[role=banner] {
   grid-template-columns: repeat(16, 1fr);
 }
 .layout-container header[role=banner] > div > div {
-  height: 10vh;
+  height: 12vh;
   grid-row: 1;
   max-height: 100%;
   width: 100%;
@@ -112,7 +112,7 @@ body.toolbar-fixed header[role=banner] {
   align-items: center;
 }
 .layout-container header[role=banner] > div > div > div > div {
-  height: 10vh;
+  height: 12vh;
 }
 .layout-container header[role=banner] > div > div > div > div a {
   display: block;
@@ -131,6 +131,10 @@ body.toolbar-fixed header[role=banner] {
 .layout-container header[role=banner] > div #block-erabletheme-logorep-2 {
   grid-column: 1/5;
 }
+.layout-container header[role=banner] > div #block-erabletheme-logorep-2 img {
+  padding-top: 0.8rem;
+  padding-bottom: 0.8rem;
+}
 @media (min-width: 760px) {
   .layout-container header[role=banner] > div #block-erabletheme-logorep-2 {
     grid-column: 0/4;
@@ -142,23 +146,38 @@ body.toolbar-fixed header[role=banner] {
   }
 }
 .layout-container header[role=banner] > div #block-erabletheme-logoepau-2 {
-  grid-column: 5/10;
+  grid-column: 5/9;
+}
+.layout-container header[role=banner] > div #block-erabletheme-logoepau-2 > div {
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.layout-container header[role=banner] > div #block-erabletheme-logoepau-2 > div > div > a > img {
+  transform: translateX(-20px);
+  padding-top: 1.2rem;
+  padding-bottom: 1.2rem;
 }
 @media (min-width: 760px) {
   .layout-container header[role=banner] > div #block-erabletheme-logoepau-2 {
     grid-column: 4/7;
   }
+  .layout-container header[role=banner] > div #block-erabletheme-logoepau-2 > div > div > a > img {
+    padding-top: 1.5rem;
+    padding-bottom: 1.5rem;
+  }
 }
 @media (min-width: 1080px) {
   .layout-container header[role=banner] > div #block-erabletheme-logoepau-2 {
     grid-column: 3/6;
   }
-  .layout-container header[role=banner] > div #block-erabletheme-logoepau-2 img {
+  .layout-container header[role=banner] > div #block-erabletheme-logoepau-2 > div > div > a > img {
-    padding: 0 1rem;
+    transform: translateX(-40px);
+    padding-top: 30px;
+    padding-bottom: 30px;
   }
 }
 .layout-container header[role=banner] > div #block-erabletheme-logoerable {
-  grid-column: 11/15;
+  grid-column: 10/15;
 }
 @media (min-width: 1080px) {
   .layout-container header[role=banner] > div #block-erabletheme-logoerable {
@@ -166,7 +185,9 @@ body.toolbar-fixed header[role=banner] {
   }
 }
 .layout-container header[role=banner] > div #block-erabletheme-logoerable img {
-  padding: 0 1.5rem;
+  padding-right: 1rem;
+  padding-top: 0.8rem;
+  padding-bottom: 0.8rem;
 }
 .layout-container header[role=banner] > div #block-erabletheme-socialmedialinks {
   display: none;
@@ -181,7 +202,7 @@ body.toolbar-fixed header[role=banner] {
 }
 .layout-container header[role=banner] > div #block-erabletheme-header #hamburger {
   cursor: pointer;
-  width: 100%;
+  width: auto;
   height: 100%;
   background-color: #00ff80;
   display: flex;
@@ -222,16 +243,14 @@ body.toolbar-fixed header[role=banner] {
   transform: translate(0rem, -0.5rem) rotate(45deg);
 }
 .layout-container header[role=banner] > div #block-erabletheme-header ul:not(.social-media-links--platforms) {
+  position: absolute;
+  z-index: -1;
   display: none;
   height: auto;
   max-height: 0vh;
   transition: max-height 0.9s ease, padding 0.5s ease-out;
-  position: fixed;
   background-color: #314e41;
-  top: 10vh;
-  left: 0;
   width: 100vw;
-  z-index: 0;
   padding: 0;
   align-items: center;
   flex-direction: column;
@@ -320,12 +339,8 @@ body.toolbar-fixed header[role=banner] {
   margin-top: 0 !important;
 }
 .layout-container #block-erabletheme-navigationprincipale {
-  position: fixed;
+  width: 100vw;
-  width: 100%;
-  margin-top: 10vh;
   display: none;
-  grid-column: 1/17;
-  grid-row: 2;
   background-color: white;
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.2);
 }
@@ -1287,6 +1302,10 @@ main.main-login .login > div > div:not(.hidden) form .button:hover, main.main-lo
   padding-right: 0.5rem;
 }
 
+#edit-field-description-0-format {
+  display: none;
+}
+
 /* PAGES */
 .home_introduction {
   position: relative;
@@ -1958,13 +1977,13 @@ main.main-login .login > div > div:not(.hidden) form .button:hover, main.main-lo
   line-height: 1.4;
   padding: 0.2rem 0;
 }
-.fullpage.meetup > .meetup_list > .views-row > article > a:not(.author, .offre-title) {
+.fullpage.meetup > .meetup_list > .views-row > article > a:not(.author, .offre-title, [title="Voir le profil utilisateur."]) {
   grid-column: 1;
   grid-row: 1/7;
   align-self: center;
   justify-self: center;
 }
-.fullpage.meetup > .meetup_list > .views-row > article > a:not(.author, .offre-title) > img {
+.fullpage.meetup > .meetup_list > .views-row > article > a:not(.author, .offre-title, [title="Voir le profil utilisateur."]) > img {
   width: 10rem;
   height: 10rem;
   border-radius: 5rem;
@@ -1980,12 +1999,20 @@ main.main-login .login > div > div:not(.hidden) form .button:hover, main.main-lo
   text-transform: uppercase;
   font-weight: 800;
 }
+.fullpage.meetup > .meetup_list > .views-row > article > a[title="Voir le profil utilisateur."] {
+  grid-column: 2;
+  grid-row: 2/3;
+  color: black;
+  text-transform: uppercase;
+  font-weight: 800;
+}
 .fullpage.meetup > .meetup_list > .views-row > article > a.author {
   grid-column: 2;
   grid-row: 2/3;
   color: black;
   text-transform: uppercase;
   font-weight: 800;
+  display: none;
 }
 .fullpage.meetup > .meetup_list > .views-row > article > a.offre-title {
   grid-column: 2;
@@ -2005,6 +2032,7 @@ main.main-login .login > div > div:not(.hidden) form .button:hover, main.main-lo
   display: none;
 }
 .fullpage.meetup > .meetup_list > .views-row > article > div.date-offre {
+  font-size: 0.8rem;
   grid-column: 2;
   grid-row: 6/7;
   height: unset !important;
@@ -2015,6 +2043,20 @@ main.main-login .login > div > div:not(.hidden) form .button:hover, main.main-lo
 .fullpage.meetup > .meetup_list > .views-row > article > .legende {
   display: none !important;
 }
+.fullpage.meetup .connectToSeeButton {
+  display: inline-block;
+  font-family: "Marianne", sans-serif;
+  font-size: 1rem;
+  line-height: 1.4;
+  padding: 0.5rem 1rem;
+  margin-top: 3rem;
+  margin-left: 3vw;
+  font-weight: 800;
+  color: white;
+  background-color: #038788;
+  transform: translateY(0);
+  transition: transform 0.2s ease-out;
+}
 .fullpage.meetup .ornements_top_over {
   top: -15vh;
 }

web/themes/erabletheme/js/erabletheme.js

@@ -162,6 +162,21 @@
         }
       }
 
+      //
+      // Check if user is connected on meetup page
+      //
+
+      const connectLink = document.querySelector('a[href="/user/login"]');
+      const meetup = document.querySelector('.meetup_list');
+
+      if (connectLink && meetup) {
+        const connectToSeeButton = document.createElement('a');
+        connectToSeeButton.classList.add('connectToSeeButton');
+        connectToSeeButton.setAttribute('href', '/user/login');
+        connectToSeeButton.append('Se connecter pour consulter les offres');
+        meetup.parentElement.insertBefore(connectToSeeButton, meetup);
+      }
+
       //
       // Effets parallax
       //

web/themes/erabletheme/scss/_meetup.scss

@@ -106,7 +106,7 @@
                     @include main_text_content();
                     padding: 0.2rem 0;
                 }
-                > a:not(.author, .offre-title) {
+                > a:not(.author, .offre-title, [title="Voir le profil utilisateur."]) {
                     grid-column: 1;
                     grid-row: 1/7;
                     align-self: center;
@@ -128,12 +128,21 @@
                         font-weight: 800;
                     }
                 }
+                > a[title="Voir le profil utilisateur."] {
+                    grid-column: 2;
+                    grid-row: 2/3;
+                    color: black;
+                    text-transform: uppercase;
+                    font-weight: 800;
+                    //display: none;
+                }
                 > a.author {
                     grid-column: 2;
                     grid-row: 2/3;
                     color: black;
                     text-transform: uppercase;
                     font-weight: 800;
+                    display: none;
                 }
                 > a.offre-title {
                     grid-column: 2;
@@ -153,6 +162,7 @@
                     }
                 }
                 > div.date-offre {
+                    font-size: 0.8rem;
                     grid-column: 2;
                     grid-row: 6/7;
                     height: unset !important;
@@ -166,6 +176,18 @@
             }
         }
     }
+    .connectToSeeButton {
+        display: inline-block;
+        @include main_text_content();
+        padding: 0.5rem 1rem;
+        margin-top: 3rem;
+        margin-left: $x_margin;
+        font-weight: 800;
+        color: white;
+        background-color: $teal;
+        transform: translateY(0);
+        transition: transform 0.2s ease-out;
+    }
 
 
     .ornements_top_over {

web/themes/erabletheme/scss/global/_global.scss

@@ -1,9 +1,17 @@
 
-main[role="main"] {
+/* main[role="main"] {
     margin-top: 10vh;
     @media (min-width: $breakpoint_desktop) {
         margin-top: calc(10vh + 3rem);
     }
+} */
+
+body {
+    overflow-x: hidden;
+}
+
+.layout-container {
+    margin: 0 !important;
 }
 
 strong {

web/themes/erabletheme/scss/partials/_forms.scss

@@ -70,3 +70,6 @@ main.main-login, main.main-user, main.main-register, main.main-contact, main.mai
         }
     }
 }
+#edit-field-description-0-format {
+    display: none;
+}

web/themes/erabletheme/scss/partials/_header.scss

@@ -9,24 +9,23 @@ body.toolbar-fixed header[role="banner"] {
 }
 
 .layout-container {
-    width: 100%;
+    //max-width: 100vw;
-    overflow: hidden;
+    //overflow: hidden;
     header[role="banner"] {
         width: 100%;
         background: white;
-        position: fixed;
-        top: 0;
-        left: 0;
         z-index: 99; 
         box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.2);
         @media (min-width: $breakpoint_desktop) {
+            position: sticky;
+            top: -12vh;
             box-shadow: none;
         }
         > div {
             display: grid;
             grid-template-columns: repeat(16, 1fr);
             > div{
-                height: 10vh;
+                height: 12vh;
                 grid-row: 1;
                 max-height: 100%;
                 width: 100%;
@@ -36,7 +35,7 @@ body.toolbar-fixed header[role="banner"] {
                     justify-content: center;
                     align-items: center;
                     > div {
-                        height: 10vh;
+                        height: 12vh;
                         a {
                             display: block;
                             height: 100%;
@@ -55,6 +54,10 @@ body.toolbar-fixed header[role="banner"] {
                 }
             }
             #block-erabletheme-logorep-2 {
+                img {
+                    padding-top: 0.8rem;
+                    padding-bottom: 0.8rem;
+                }
                 grid-column: 1 / 5;
                 @media (min-width: $breakpoint_tablet) {
                     grid-column: 0 / 4;
@@ -64,24 +67,41 @@ body.toolbar-fixed header[role="banner"] {
                 }
             }
             #block-erabletheme-logoepau-2 {
-                grid-column: 5 / 10;
+                grid-column: 5 / 9;
+                > div {
+                    align-items: flex-start;
+                    justify-content: flex-start;
+                    > div > a > img {
+                        transform: translateX(-20px);
+                        padding-top: 1.2rem;
+                        padding-bottom: 1.2rem;
+                    }
+                }
                 @media (min-width: $breakpoint_tablet) {
                     grid-column: 4 / 7;
+                    > div > div > a > img {
+                        padding-top: 1.5rem;
+                        padding-bottom: 1.5rem;
+                    }
                 }
                 @media (min-width: $breakpoint_desktop) {
                     grid-column: 3 / 6;
-                    img {
+                    > div > div > a > img {
-                        padding: 0 1rem;
+                        transform: translateX(-40px);
+                        padding-top: 30px;
+                        padding-bottom: 30px;
                     }
                 }
             }
             #block-erabletheme-logoerable {
-                grid-column: 11 / 15;
+                grid-column: 10 / 15;
                 @media (min-width: $breakpoint_desktop) {
                     grid-column: 14 / 16;
                 }
                 img {
-                    padding: 0 1.5rem;
+                    padding-right: 1rem;
+                    padding-top: 0.8rem;
+                    padding-bottom: 0.8rem;
                 }
             }
             #block-erabletheme-socialmedialinks {
@@ -94,7 +114,7 @@ body.toolbar-fixed header[role="banner"] {
                 }
                 #hamburger {
                     cursor: pointer;
-                    width: 100%;
+                    width: auto;
                     height: 100%;
                     background-color: $fluo_green;
                     display: flex;
@@ -137,16 +157,14 @@ body.toolbar-fixed header[role="banner"] {
                     }
                 }
                 ul:not(.social-media-links--platforms) {
+                    position: absolute;
+                    z-index: -1;
                     display: none;
                     height: auto;
                     max-height: 0vh;
                     transition: max-height 0.9s ease, padding 0.5s ease-out;
-                    position: fixed;
                     background-color: $dark_green;
-                    top: 10vh;
-                    left: 0;
                     width: 100vw;
-                    z-index: 0;
                     padding: 0;
                     align-items: center;
                     flex-direction: column;
@@ -236,12 +254,8 @@ body.toolbar-fixed header[role="banner"] {
         }
     }
     #block-erabletheme-navigationprincipale {
-        position: fixed;
+        width: 100vw;
-        width: 100%;
-        margin-top: 10vh;
         display: none;
-        grid-column: 1 / 17;
-        grid-row: 2;
         background-color: white;
         box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.2);
         @media (min-width: $breakpoint_desktop) {