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(navigation): correctifs de style mega-menu [DS-3549, DS-3548] #785

Merged
merged 4 commits into from
Nov 9, 2023
Merged

🐛 fix(navigation): correctifs de style mega-menu [DS-3549, DS-3548] #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 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
0db05a0
fix(mega-menu): correctifs de style
zellerbaptiste Sep 11, 2023
eb76784
fix(mega-menu): correctifs de style
zellerbaptiste Sep 13, 2023
5832feb
fix(navigation): utilise la mixin nest-link
zellerbaptiste Sep 21, 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
2 changes: 2 additions & 0 deletions src/component/navigation/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
/// @group navigation
////

@import '../link/index';

@import '../../core/index';
6 changes: 6 additions & 0 deletions src/component/navigation/style/module/_mega-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,16 @@

&__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);
@include nest-link(sm, null);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • pas besoin du chevron je pense -> juste "p"
  • Nesting de la taille du lien en sm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c'est corrigé

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utiliser plutot @include nest-link(sm, null); pour le lien

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok c'est remplacé

p {
@include text-style(sm);
}
}

&__category {
Expand Down
2 changes: 1 addition & 1 deletion src/component/navigation/style/scheme/_default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
zellerbaptiste marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/component/navigation/template/ejs/leader.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down