Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 fix(header): ajustements header [DS-3601, DS-3368] #791

Merged
merged 7 commits into from
Nov 10, 2023
Merged

🐛 fix(header): ajustements header [DS-3601, DS-3368] #791

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c82fee
🐛 fix(consent): coche les cookies obligatoires par defaut [DS-3524] (…
zellerbaptiste Aug 28, 2023
71e48eb
fix(header): met a jour la taille de la barre de recherche
zellerbaptiste Sep 7, 2023
044a5cd
fix(header): ajustement header
keryanS Sep 15, 2023
3687b8c
fix(header): logo operateur
keryanS Sep 15, 2023
4b8fad1
Merge pull request #776 from GouvernementFR/fix/header-searchbar-size
keryanS Sep 15, 2023
8d1ae7c
fix(header): tagline en taille sm
keryanS Oct 18, 2023
0781c73
feat(header): correction menu burger (#722)
zellerbaptiste Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/component/consent/example/sample/modal/body.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/component/header/example/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

<%- sample('Header avec nom de service, recherche', './sample/header.ejs', {header: { logo:{ title: 'Intitulé<br>officiel'}, service: 'title', search: true, navigation: 'min' }}, true, './layout'); %>

<%- sample('Header avec opérateur vertical, recherche', './sample/header.ejs', {header: { logo:{ title: 'République<br>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<br>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<br>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<br>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é<br>officiel'}, links:true, duplicateLinks: true }}, true, './layout'); %>

<%- sample('Header avec bandeau BETA', './sample/header.ejs', {header: { logo:{ title: 'Intitulé<br>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é<br>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é<br>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é<br>officiel'}, beta: true, navigation: 'min' }}, true, './layout'); %>

Expand Down
4 changes: 0 additions & 4 deletions src/component/header/style/_scheme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@

#{ns(btn)} {
@include btn-kind-scheme(4, $legacy);

&--menu {
@include color.text(default grey, (legacy:$legacy));
}
}
}

Expand Down
5 changes: 1 addition & 4 deletions src/component/header/style/module/_brand.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
&__operator,
&__service {
@include padding(4v, lg);

&:not(:last-child) {
@include margin-right(2v, lg);
}
}

&__logo {
Expand All @@ -65,6 +61,7 @@

img {
display: block;
@include min-width(14v);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/component/header/style/module/_tools.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#{ns(header__search)} {
@include respond-from(lg) {
@include max-size(100v);
@include max-size(96v);
@include margin-left(auto);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tool/example/decorator.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:10rem;');
break;
default:
data.operator = operator;
Expand Down