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

EWPP-4152: Fix ECL 4 styling issues. #1426

Merged
merged 7 commits into from
Mar 13, 2024
Merged

EWPP-4152: Fix ECL 4 styling issues. #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b99e5f
EWPP-4152: Use icon size 'xs' for social media links pattern.
22Alexandra Mar 4, 2024
c770622
EWPP-4152: Fix EC logo file for mobile.
22Alexandra Mar 4, 2024
c9777bb
EWPP-4152: Remove column title separator on EC Footer.
22Alexandra Mar 4, 2024
96a276b
EWPP-4152: Add a break line before the site owner in the footer templ…
22Alexandra Mar 4, 2024
d2329de
EWPP-4152: Adapt test coverage.
22Alexandra Mar 4, 2024
9b1fccd
EWPP-4152: Update Social icon pattern to follow ECL.
22Alexandra Mar 5, 2024
f7211a0
EWPP-4152: Fix translations strings.
22Alexandra Mar 8, 2024
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
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-bg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ msgstr "Повече информация на:"
msgid "Discover more on @link"
msgstr "Научете повече на @link"

msgid "This site is managed by: @name"
msgstr "Този сайт се управлява от: @name"
msgid "This site is managed by:<br />@name"
msgstr "Този сайт се управлява от:<br />@name"

msgid "Last updated on: @date"
msgstr "Последна актуализация на: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-cs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Více informací na:"
msgid "Discover more on @link"
msgstr "Další informace @link"

msgid "This site is managed by: @name"
msgstr "Tyto stránky spravuje: @name"
msgid "This site is managed by:<br />@name"
msgstr "Tyto stránky spravuje:<br />@name"

msgid "Last updated on: @date"
msgstr "Poslední aktualizace: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-da.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Du kan læse mere på:"
msgid "Discover more on @link"
msgstr "Læs mere på @link"

msgid "This site is managed by: @name"
msgstr "Dette website administreres af: @name"
msgid "This site is managed by:<br />@name"
msgstr "Dette website administreres af:<br />@name"

msgid "Last updated on: @date"
msgstr "Senest opdateret den: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Weitere Informationen:"
msgid "Discover more on @link"
msgstr "Weitere Informationen @link"

msgid "This site is managed by: @name"
msgstr "Betreiber der Website: @name"
msgid "This site is managed by:<br />@name"
msgstr "Betreiber der Website:<br />@name"

msgid "Last updated on: @date"
msgstr "Letzte Aktualisierung: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-el.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Περισσότερες πληροφορίες για:"
msgid "Discover more on @link"
msgstr "Μάθετε περισσότερα: @link"

msgid "This site is managed by: @name"
msgstr "Διαχειριστής ιστότοπου: @name"
msgid "This site is managed by:<br />@name"
msgstr "Διαχειριστής ιστότοπου:<br />@name"

msgid "Last updated on: @date"
msgstr "Τελευταία επικαιροποίηση την/στις: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Más información sobre:"
msgid "Discover more on @link"
msgstr "Más información @link"

msgid "This site is managed by: @name"
msgstr "Este sitio está gestionado por: @name"
msgid "This site is managed by:<br />@name"
msgstr "Este sitio está gestionado por:<br />@name"

msgid "Last updated on: @date"
msgstr "Última actualización el: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-et.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Lisateave:"
msgid "Discover more on @link"
msgstr "Lisateavet leiate aadressil @link"

msgid "This site is managed by: @name"
msgstr "Seda veebisaiti haldab: @name"
msgid "This site is managed by:<br />@name"
msgstr "Seda veebisaiti haldab:<br />@name"

msgid "Last updated on: @date"
msgstr "Viimati ajakohastatud: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-fi.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Lisätietoa:"
msgid "Discover more on @link"
msgstr "Lisää EU-aiheita: @link"

msgid "This site is managed by: @name"
msgstr "Sivuston ylläpitäjä: @name"
msgid "This site is managed by:<br />@name"
msgstr "Sivuston ylläpitäjä:<br />@name"

msgid "Last updated on: @date"
msgstr "Päivitetty viimeksi: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "En savoir plus sur:"
msgid "Discover more on @link"
msgstr "En savoir plus @link"

msgid "This site is managed by: @name"
msgstr "Gestionnaire du site : @name"
msgid "This site is managed by:<br />@name"
msgstr "Gestionnaire du site :<br />@name"

msgid "Last updated on: @date"
msgstr "Dernière mise à jour: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-ga.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Tuilleadh Eolais:"
msgid "Discover more on @link"
msgstr "Tuilleadh eolais @link"

msgid "This site is managed by: @name"
msgstr "Tá an suíomh seo á bhainistiú ag: @name"
msgid "This site is managed by:<br />@name"
msgstr "Tá an suíomh seo á bhainistiú ag:<br />@name"

msgid "Last updated on: @date"
msgstr "An uair dheiridh a nuashonraíodh: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-hr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Dodatne informacije:"
msgid "Discover more on @link"
msgstr "Otkrijte više na stranici @link"

msgid "This site is managed by: @name"
msgstr "Ovim internetskim stranicama upravlja: @name"
msgid "This site is managed by:<br />@name"
msgstr "Ovim internetskim stranicama upravlja:<br />@name"

msgid "Last updated on: @date"
msgstr "Posljednji put ažurirano: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-hu.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "További információk:"
msgid "Discover more on @link"
msgstr "Bővebb tudnivalók: @link"

msgid "This site is managed by: @name"
msgstr "A webhely üzemeltetője: @name"
msgid "This site is managed by:<br />@name"
msgstr "A webhely üzemeltetője:<br />@name"

msgid "Last updated on: @date"
msgstr "Legutóbbi frissítés: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-it.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Per saperne di più:"
msgid "Discover more on @link"
msgstr "Scopri di più @link"

msgid "This site is managed by: @name"
msgstr "Il sito è gestito da: @name"
msgid "This site is managed by:<br />@name"
msgstr "Il sito è gestito da:<br />@name"

msgid "Last updated on: @date"
msgstr "Ultimo aggiornamento: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-lt.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Daugiau informacijos apie:"
msgid "Discover more on @link"
msgstr "Daugiau informacijos @link"

msgid "This site is managed by: @name"
msgstr "Šią svetainę tvarko: @name"
msgid "This site is managed by:<br />@name"
msgstr "Šią svetainę tvarko:<br />@name"

msgid "Last updated on: @date"
msgstr "Paskutinį kartą atnaujinta: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-lv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Plašāka informācija:"
msgid "Discover more on @link"
msgstr "Plašāka informācija @link"

msgid "This site is managed by: @name"
msgstr "Šo vietni pārvalda: @name"
msgid "This site is managed by:<br />@name"
msgstr "Šo vietni pārvalda:<br />@name"

msgid "Last updated on: @date"
msgstr "Pēdējoreiz atjaunināts: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-mt.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Aktar informazzjoni:"
msgid "Discover more on @link"
msgstr "Skopri aktar @link"

msgid "This site is managed by: @name"
msgstr "Dan is-sit hu mmaniġġjat minn: @name"
msgid "This site is managed by:<br />@name"
msgstr "Dan is-sit hu mmaniġġjat minn:<br />@name"

msgid "Last updated on: @date"
msgstr "L-aħħar aġġornament: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-nl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Meer informatie over:"
msgid "Discover more on @link"
msgstr "Meer informatie op @link"

msgid "This site is managed by: @name"
msgstr "Deze site wordt beheerd door: @name"
msgid "This site is managed by:<br />@name"
msgstr "Deze site wordt beheerd door:<br />@name"

msgid "Last updated on: @date"
msgstr "Laatste update: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-pl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Więcej informacji:"
msgid "Discover more on @link"
msgstr "Więcej informacji: @link"

msgid "This site is managed by: @name"
msgstr "Stroną zarządza: @name"
msgid "This site is managed by:<br />@name"
msgstr "Stroną zarządza:<br />@name"

msgid "Last updated on: @date"
msgstr "Ostatnia aktualizacja: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-pt-pt.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Mais informações:"
msgid "Discover more on @link"
msgstr "Para saber mais @link"

msgid "This site is managed by: @name"
msgstr "Este sítio Web é gerido por: @name"
msgid "This site is managed by:<br />@name"
msgstr "Este sítio Web é gerido por:<br />@name"

msgid "Last updated on: @date"
msgstr "Última atualização em: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-ro.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Pentru detalii:"
msgid "Discover more on @link"
msgstr "Aflați mai multe @link"

msgid "This site is managed by: @name"
msgstr "Acest site este administrat de: @name"
msgid "This site is managed by:<br />@name"
msgstr "Acest site este administrat de:<br />@name"

msgid "Last updated on: @date"
msgstr "Ultima actualizare: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-sk.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Viac informácií:"
msgid "Discover more on @link"
msgstr "Viac informácií @link"

msgid "This site is managed by: @name"
msgstr "Túto stránku spravuje: @name"
msgid "This site is managed by:<br />@name"
msgstr "Túto stránku spravuje:<br />@name"

msgid "Last updated on: @date"
msgstr "Naposledy aktualizované: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-sl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Več informacij:"
msgid "Discover more on @link"
msgstr "Več informacij @link"

msgid "This site is managed by: @name"
msgstr "Spletišče upravlja: @name"
msgid "This site is managed by:<br />@name"
msgstr "Spletišče upravlja:<br />@name"

msgid "Last updated on: @date"
msgstr "Zadnja posodobitev: @date"
Expand Down
4 changes: 2 additions & 2 deletions modules/oe_theme_helper/translations/oe_theme_helper-sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ msgstr "Läs mer på:"
msgid "Discover more on @link"
msgstr "Upptäck mer på @link"

msgid "This site is managed by: @name"
msgstr "Den här webbplatsen sköts av @name"
msgid "This site is managed by:<br />@name"
msgstr "Den här webbplatsen sköts av<br />@name"

msgid "Last updated on: @date"
msgstr "Senaste uppdatering: @date"
Expand Down
2 changes: 1 addition & 1 deletion templates/blocks/block--system-branding-block.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}) %}
{% set _picture = _picture|merge({
img: {
src: ecl_logo_path ~ '/positive/logo-ec--' ~ current_language_id|to_internal_language_id ~ '.svg',
src: ecl_logo_path ~ '/logo-ec--mute.svg',
alt: site_logo_alt,
},
}) %}
Expand Down
2 changes: 1 addition & 1 deletion templates/navigation/oe-corporate-blocks-ec-footer--core.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'path': path,
'src_desktop': desktop_logo_path,
},
'description': site_owner ? 'This site is managed by: @name'|t({'@name': site_owner}),
'description': site_owner ? 'This site is managed by:<br />@name'|t({'@name': site_owner}),
sergepavle marked this conversation as resolved.
Show resolved Hide resolved
},
] %}
{% set _second_column = [
Expand Down
8 changes: 4 additions & 4 deletions templates/navigation/oe-corporate-blocks-ec-footer--standardised.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
{% if loop.index is odd %}
{% set _top_left_column = _top_left_column|merge([{
'title': section.label,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(section.links),
}]) %}
{% else %}
{% set _top_right_column = _top_right_column|merge([{
'title': section.label,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(section.links),
}]) %}
{% endif %}
Expand All @@ -51,7 +51,7 @@
{# Follow section must always be the last on the left. #}
{% set _top_left_column = _top_left_column|merge([{
'title': 'Follow us'|t,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(site_specific_footer.social_links),
'links_inline': true,
}]) %}
Expand Down Expand Up @@ -82,7 +82,7 @@
'path': url('<front>'),
}
},
'description': site_owner ? 'This site is managed by: @name'|t({'@name': site_owner}),
'description': site_owner ? 'This site is managed by:<br />@name'|t({'@name': site_owner}),
'links': _top_row_links,
'section_class_name': 'ecl-site-footer__section--site-info',
}
Expand Down
10 changes: 5 additions & 5 deletions templates/navigation/oe-corporate-blocks-eu-footer--core.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@
'alt': 'European Union flag'|t,
'aria_label': 'Home'|t ~ ' - ' ~ 'European Union'|t,
},
'description': site_owner ? 'This site is managed by: @name'|t({'@name': site_owner}),
'description': site_owner ? 'This site is managed by:<br />@name'|t({'@name': site_owner}),
},
],
[
{
'title': corporate_footer.contact_title,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(corporate_footer.contact),
},
{
'title': corporate_footer.social_media_title,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(corporate_footer.social_media),
},
{
'title': corporate_footer.legal_links_title,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(corporate_footer.legal_links),
},
],
[
{
'title': corporate_footer.institution_links_title,
'title_with_separator': true,
'title_with_separator': false,
'links': ecl_footer_links(corporate_footer.institution_links),
},
],
Expand Down
10 changes: 5 additions & 5 deletions templates/navigation/oe-corporate-blocks-eu-footer--standardised.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
'path': url('<front>'),
}
},
'description': site_owner ? 'This site is managed by: @name'|t({'@name': site_owner}),
'description': site_owner ? 'This site is managed by:<br />@name'|t({'@name': site_owner}),
'links': _top_row_links,
'section_class_name': 'ecl-site-footer__section--site-info',
}
Expand Down Expand Up @@ -66,24 +66,24 @@
{
'title': corporate_footer.contact_title,
'links': ecl_footer_links(corporate_footer.contact),
'title_with_separator': true,
'title_with_separator': false,
},
{
'title': corporate_footer.social_media_title,
'links': ecl_footer_links(corporate_footer.social_media),
'title_with_separator': true,
'title_with_separator': false,
},
{
'title': corporate_footer.legal_links_title,
'links': ecl_footer_links(corporate_footer.legal_links),
'title_with_separator': true,
'title_with_separator': false,
}
],
[
{
'title': corporate_footer.institution_links_title,
'links': ecl_footer_links(corporate_footer.institution_links),
'title_with_separator': true,
'title_with_separator': false,
}
],
] %}
Expand Down
6 changes: 4 additions & 2 deletions templates/patterns/social_icon/pattern-social-icon.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
},
'icon': {
'path': ecl_icon_social_media_path,
'name': service
}
'name': service,
'extra_classes': 'ecl-social-media-follow__icon'
},
'extra_classes': 'ecl-social-media-follow__link'
} only %}
2 changes: 1 addition & 1 deletion templates/patterns/social_media_links/pattern-social-media-links.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
icon: {
path: ecl_icon_social_media_path,
name: link.service,
size: 'l'
size: 'xs'
}
}) %}
{% endif %}
Expand Down
Loading