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(follow): corrige affichage [DS-3529, DS-3531, DS-3532] #781

Merged
merged 4 commits into from
Nov 7, 2023
Merged

🐛 fix(follow): corrige affichage [DS-3529, DS-3531, DS-3532] #781

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
8fdb0aa
fix(follow): corrige ordre des boutons
zellerbaptiste Sep 8, 2023
3032b6c
fix(follow): corrige les espacements
zellerbaptiste Sep 8, 2023
db472c9
fix(follow): corrige affichage bouton en mobile
zellerbaptiste Sep 8, 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
12 changes: 6 additions & 6 deletions src/component/follow/example/data/socials.json.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ data.socials = {
url: contentPlaceholder("Lien vers le twitter de l'organisation"),
title: contentPlaceholder("Intitulé du lien") + " - nouvelle fenêtre",
},
{
label: "instagram",
type: "instagram",
url: contentPlaceholder("Lien vers l'instagram de l'organisation"),
title: contentPlaceholder("Intitulé du lien") + " - nouvelle fenêtre",
},
{
label: "linkedin",
type: "linkedin",
url: contentPlaceholder("Lien vers le linkedin de l'organisation"),
title: contentPlaceholder("Intitulé du lien") + " - nouvelle fenêtre",
},
{
label: "instagram",
type: "instagram",
url: contentPlaceholder("Lien vers l'instagram de l'organisation"),
title: contentPlaceholder("Intitulé du lien") + " - nouvelle fenêtre",
},
{
label: "youtube",
type: "youtube",
Expand Down
2 changes: 1 addition & 1 deletion src/component/follow/style/_module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

#{ns-group(btns)} {
@include horizontal-btns-group;
@include margin(0 -4v -4v -4v);
@include margin-bottom(-4v);
@include width(auto);

#{ns(btn)} {
Expand Down
2 changes: 1 addition & 1 deletion src/component/follow/template/ejs/newsletter.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ let newsletterClasses = [prefix + '-follow__newsletter'];
</form>
<% } %>
<% } else if (newsletter.type === 'button') { %>
<%- include('../../../button/template/ejs/button.ejs', {button: newsletter.button}); %>
<%- include('../../../button/template/ejs/buttons-group.ejs', {buttonsGroup: {inline: 'md', buttons: [newsletter.button]}}); %>
<% } else if (newsletter.type === 'alert') { %>
<%- include('../../../alert/template/ejs/alert.ejs', {alert: newsletter.alert}); %>
<% } %>
Expand Down