From 9c82fee39699c8c1bf26a248272d9f412a67eae8 Mon Sep 17 00:00:00 2001 From: "Baptiste.z" Date: Mon, 28 Aug 2023 11:54:28 +0200 Subject: [PATCH 1/6] =?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 71e48ebd94054e7731bd96e212a17e2e4c630287 Mon Sep 17 00:00:00 2001 From: zellerbaptiste Date: Thu, 7 Sep 2023 14:22:33 +0200 Subject: [PATCH 2/6] fix(header): met a jour la taille de la barre de recherche --- src/component/header/style/module/_tools.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/header/style/module/_tools.scss b/src/component/header/style/module/_tools.scss index c53c3b7bb..f46ce11e7 100644 --- a/src/component/header/style/module/_tools.scss +++ b/src/component/header/style/module/_tools.scss @@ -20,7 +20,7 @@ #{ns(header__search)} { @include respond-from(lg) { - @include max-size(100v); + @include max-size(96v); @include margin-left(auto); } } From 044a5cdaf3e6160110a6a02984fd25d4e0e38fe1 Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Fri, 15 Sep 2023 10:40:11 +0200 Subject: [PATCH 3/6] fix(header): ajustement header --- src/component/header/example/index.ejs | 6 +++--- src/component/header/style/_scheme.scss | 4 ---- src/component/header/style/module/_brand.scss | 5 +---- src/component/header/style/module/_tools.scss | 2 +- tool/example/decorator.ejs | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/component/header/example/index.ejs b/src/component/header/example/index.ejs index 2df855463..2936eaeb8 100755 --- a/src/component/header/example/index.ejs +++ b/src/component/header/example/index.ejs @@ -22,15 +22,15 @@ <%- sample('Header avec nom de service, recherche', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, service: 'title', search: true, navigation: 'min' }}, true, './layout'); %> -<%- sample('Header avec opérateur vertical, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.9x16.png', 'rendered', null, null, 'width:3.5rem;'), search: true, navigation: 'min' }}, true, './layout'); %> +<%- sample('Header avec logo opérateur vertical, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.3x4.png', 'rendered', null, null, 'max-width:3.5rem;'), search: true, navigation: 'min' }}, true, './layout'); %> -<%- sample('Header avec opérateur horizontal, nom de service, lien d’accès, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:9.0625rem;'), service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> +<%- sample('Header avec logo opérateur horizontal, nom de service, lien d’accès, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:9.0625rem;'), service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> <%- sample('Header avec raccourcis dupliqués, pour Angular, React et Vue', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, links:true, duplicateLinks: true }}, true, './layout'); %> <%- sample('Header avec bandeau BETA', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, beta: true, service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> -<%- sample('Header logo opérateur + bandeau BETA', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, operator: imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:9.0625rem;'), beta: true, service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> +<%- sample('Header logo opérateur + bandeau BETA', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, operator: imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:8rem;'), beta: true, service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> <%- sample('Header min avec bandeau BETA', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, beta: true, navigation: 'min' }}, true, './layout'); %> diff --git a/src/component/header/style/_scheme.scss b/src/component/header/style/_scheme.scss index 35ce98816..5bcff24f5 100644 --- a/src/component/header/style/_scheme.scss +++ b/src/component/header/style/_scheme.scss @@ -55,10 +55,6 @@ #{ns(btn)} { @include btn-kind-scheme(4, $legacy); - - &--menu { - @include color.text(default grey, (legacy:$legacy)); - } } } diff --git a/src/component/header/style/module/_brand.scss b/src/component/header/style/module/_brand.scss index e5d94e199..e02a9ec4d 100644 --- a/src/component/header/style/module/_brand.scss +++ b/src/component/header/style/module/_brand.scss @@ -43,10 +43,6 @@ &__operator, &__service { @include padding(4v, lg); - - &:not(:last-child) { - @include margin-right(2v, lg); - } } &__logo { @@ -65,6 +61,7 @@ img { display: block; + @include min-width(14v); } } diff --git a/src/component/header/style/module/_tools.scss b/src/component/header/style/module/_tools.scss index c53c3b7bb..f46ce11e7 100644 --- a/src/component/header/style/module/_tools.scss +++ b/src/component/header/style/module/_tools.scss @@ -20,7 +20,7 @@ #{ns(header__search)} { @include respond-from(lg) { - @include max-size(100v); + @include max-size(96v); @include margin-left(auto); } } diff --git a/tool/example/decorator.ejs b/tool/example/decorator.ejs index b6ef90dd3..7c6daa0ab 100644 --- a/tool/example/decorator.ejs +++ b/tool/example/decorator.ejs @@ -140,7 +140,7 @@ const brandData = (component = 'header', logo = true, service = false, operator fullTitle.push(contentPlaceholder(operatorPlaceholder)); switch (typeof operator) { case 'boolean': - if (operator) data.operator = imgData('img/placeholder.9x16.png', 'rendered', null, null, 'width:3.5rem;'); + if (operator) data.operator = imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:8rem;'); break; default: data.operator = operator; From 3687b8c39eda8611614e0cd1b15c6e66f9bcaddf Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Fri, 15 Sep 2023 10:48:46 +0200 Subject: [PATCH 4/6] fix(header): logo operateur --- src/component/header/example/index.ejs | 2 +- tool/example/decorator.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/header/example/index.ejs b/src/component/header/example/index.ejs index 2936eaeb8..3cfd96cd0 100755 --- a/src/component/header/example/index.ejs +++ b/src/component/header/example/index.ejs @@ -24,7 +24,7 @@ <%- sample('Header avec logo opérateur vertical, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.3x4.png', 'rendered', null, null, 'max-width:3.5rem;'), search: true, navigation: 'min' }}, true, './layout'); %> -<%- sample('Header avec logo opérateur horizontal, nom de service, lien d’accès, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:9.0625rem;'), service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> +<%- sample('Header avec logo opérateur horizontal, nom de service, lien d’accès, recherche', './sample/header.ejs', {header: { logo:{ title: 'République
Française'}, operator: imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:8rem;'), service: true, links:true, search: true, navigation: 'min' }}, true, './layout'); %> <%- sample('Header avec raccourcis dupliqués, pour Angular, React et Vue', './sample/header.ejs', {header: { logo:{ title: 'Intitulé
officiel'}, links:true, duplicateLinks: true }}, true, './layout'); %> diff --git a/tool/example/decorator.ejs b/tool/example/decorator.ejs index 7c6daa0ab..bce38a330 100644 --- a/tool/example/decorator.ejs +++ b/tool/example/decorator.ejs @@ -140,7 +140,7 @@ const brandData = (component = 'header', logo = true, service = false, operator fullTitle.push(contentPlaceholder(operatorPlaceholder)); switch (typeof operator) { case 'boolean': - if (operator) data.operator = imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:8rem;'); + if (operator) data.operator = imgData('img/placeholder.16x9.png', 'rendered', null, null, 'max-width:10rem;'); break; default: data.operator = operator; From 8d1ae7c45ac0d80628e6ec1335465340941fe8e7 Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Wed, 18 Oct 2023 17:40:09 +0200 Subject: [PATCH 5/6] fix(header): tagline en taille sm --- src/component/header/style/module/_brand.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/component/header/style/module/_brand.scss b/src/component/header/style/module/_brand.scss index e02a9ec4d..a445c9432 100644 --- a/src/component/header/style/module/_brand.scss +++ b/src/component/header/style/module/_brand.scss @@ -83,5 +83,9 @@ @include margin(-1v 0 0 1v); } } + + &-tagline { + @include text-style(sm); + } } } From 0781c730f12e779d1228c90cdb77c844c220445d Mon Sep 17 00:00:00 2001 From: "Baptiste.z" Date: Fri, 20 Oct 2023 15:38:28 +0200 Subject: [PATCH 6/6] feat(header): correction menu burger (#722) - feat(header): corrige la couleur et les espacements des icones menu et burger en mobile --- src/component/header/style/_scheme.scss | 4 ++++ src/component/header/style/module/_brand.scss | 1 + src/component/header/style/module/_navbar.scss | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/src/component/header/style/_scheme.scss b/src/component/header/style/_scheme.scss index 5bcff24f5..d43b50f85 100644 --- a/src/component/header/style/_scheme.scss +++ b/src/component/header/style/_scheme.scss @@ -55,6 +55,10 @@ #{ns(btn)} { @include btn-kind-scheme(4, $legacy); + + &--menu { + @include btn-kind-scheme(3, $legacy); + } } } diff --git a/src/component/header/style/module/_brand.scss b/src/component/header/style/module/_brand.scss index a445c9432..7146a05e0 100644 --- a/src/component/header/style/module/_brand.scss +++ b/src/component/header/style/module/_brand.scss @@ -11,6 +11,7 @@ @include margin-y(-4v, lg); @include size(100%); @include padding-x(1v); + overflow: hidden; @include media-query.respond-from(lg) { flex-wrap: nowrap; diff --git a/src/component/header/style/module/_navbar.scss b/src/component/header/style/module/_navbar.scss index bb4549939..97fe80c91 100644 --- a/src/component/header/style/module/_navbar.scss +++ b/src/component/header/style/module/_navbar.scss @@ -10,6 +10,8 @@ @include display-flex(row,flex-end); @include padding(1v); @include margin-left(auto); + @include margin-right(-2v); + @include margin-top(1v); order: 3; flex: 0 0 auto; align-self: flex-start; @@ -20,6 +22,8 @@ } @include nest-btn(md, only) { + @include margin-left(2v); + @include margin-right(2v); flex: 0 0 auto; white-space: nowrap;