style(header): remove fr-header__with-notice-info when notice is closed

This commit is contained in:
Colin Darie 2022-09-14 19:23:40 +02:00
parent 7e6624753a
commit 4d5f03b99c
5 changed files with 28 additions and 5 deletions

View file

@ -12,8 +12,12 @@ $header-mobile-breakpoint: 550px;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.new-header-with-border { // No drop shadow when a notice is shown.
border-bottom: 1px solid $border-grey; .fr-header.fr-header__with-notice-info {
&,
.fr-header__brand {
filter: none;
}
} }
.header-inner-content { .header-inner-content {

View file

@ -5,5 +5,5 @@
= title = title
- if closable? - if closable?
%button.fr-btn--close.fr-btn{ title: t('.close_notice'), onclick: 'const notice = this.parentNode.parentNode.parentNode; notice.parentNode.removeChild' } %button.fr-btn--close.fr-btn{ title: t('.close_notice'), onclick: 'javascript:DS.closeNoticeInfo(event)' }
= t('.close_notice') = t('.close_notice')

View file

@ -37,6 +37,8 @@ import {
showNewAccountPasswordConfirmation showNewAccountPasswordConfirmation
} from '../new_design/fc-fusion'; } from '../new_design/fc-fusion';
import { closeNoticeInfo } from '../new_design/header';
const application = Application.start(); const application = Application.start();
registerControllers(application); registerControllers(application);
@ -52,7 +54,8 @@ const DS = {
showNewAccountPasswordConfirmation, showNewAccountPasswordConfirmation,
replaceSemicolonByComma, replaceSemicolonByComma,
acceptEmailSuggestion, acceptEmailSuggestion,
discardEmailSuggestionBox discardEmailSuggestionBox,
closeNoticeInfo
}; };
// Start Rails helpers // Start Rails helpers

View file

@ -0,0 +1,16 @@
export function closeNoticeInfo(event) {
// DSFR usptream code
const notice = event.target.parentNode.parentNode.parentNode;
notice.parentNode.removeChild(notice);
// Update class accordingly because
// header style is slightly different with or without notice
if (document.querySelector) {
const klass = 'fr-header__with-notice-info';
const header = document.querySelector('.' + klass);
if (header) {
header.classList.remove(klass);
}
}
}

View file

@ -6,7 +6,7 @@
- is_expert_context = nav_bar_profile == :expert && expert_signed_in? - is_expert_context = nav_bar_profile == :expert && expert_signed_in?
- is_user_context = nav_bar_profile == :user - is_user_context = nav_bar_profile == :user
- is_search_enabled = [params[:controller] == 'recherche', is_instructeur_context, is_expert_context, is_user_context && current_user.dossiers.count].any? - is_search_enabled = [params[:controller] == 'recherche', is_instructeur_context, is_expert_context, is_user_context && current_user.dossiers.count].any?
%header{ class: current_page?(root_path) ? "fr-header" : "fr-header new-header-with-border", role: "banner" } %header{ class: ["fr-header", content_for?(:notice_info) && "fr-header__with-notice-info"], role: "banner" }
.fr-header__body .fr-header__body
.fr-container .fr-container
.fr-header__body-row .fr-header__body-row