diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-bg.po b/modules/oe_theme_helper/translations/oe_theme_helper-bg.po index e4b3b3cc8..8e21ef510 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-bg.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-bg.po @@ -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:
@name" +msgstr "Този сайт се управлява от:
@name" msgid "Last updated on: @date" msgstr "Последна актуализация на: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-cs.po b/modules/oe_theme_helper/translations/oe_theme_helper-cs.po index ce83cf207..84fce7af1 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-cs.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-cs.po @@ -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:
@name" +msgstr "Tyto stránky spravuje:
@name" msgid "Last updated on: @date" msgstr "Poslední aktualizace: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-da.po b/modules/oe_theme_helper/translations/oe_theme_helper-da.po index abb7d176b..cc0830810 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-da.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-da.po @@ -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:
@name" +msgstr "Dette website administreres af:
@name" msgid "Last updated on: @date" msgstr "Senest opdateret den: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-de.po b/modules/oe_theme_helper/translations/oe_theme_helper-de.po index fa8852258..9b42e5491 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-de.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-de.po @@ -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:
@name" +msgstr "Betreiber der Website:
@name" msgid "Last updated on: @date" msgstr "Letzte Aktualisierung: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-el.po b/modules/oe_theme_helper/translations/oe_theme_helper-el.po index 0f539f061..4918508ef 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-el.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-el.po @@ -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:
@name" +msgstr "Διαχειριστής ιστότοπου:
@name" msgid "Last updated on: @date" msgstr "Τελευταία επικαιροποίηση την/στις: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-es.po b/modules/oe_theme_helper/translations/oe_theme_helper-es.po index 42db6d7ce..d39ba7289 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-es.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-es.po @@ -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:
@name" +msgstr "Este sitio está gestionado por:
@name" msgid "Last updated on: @date" msgstr "Última actualización el: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-et.po b/modules/oe_theme_helper/translations/oe_theme_helper-et.po index 48d231e3e..35d6be6e1 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-et.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-et.po @@ -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:
@name" +msgstr "Seda veebisaiti haldab:
@name" msgid "Last updated on: @date" msgstr "Viimati ajakohastatud: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-fi.po b/modules/oe_theme_helper/translations/oe_theme_helper-fi.po index fd0880237..1b66b6ad9 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-fi.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-fi.po @@ -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:
@name" +msgstr "Sivuston ylläpitäjä:
@name" msgid "Last updated on: @date" msgstr "Päivitetty viimeksi: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-fr.po b/modules/oe_theme_helper/translations/oe_theme_helper-fr.po index a2e1c4860..4142fa43d 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-fr.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-fr.po @@ -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:
@name" +msgstr "Gestionnaire du site :
@name" msgid "Last updated on: @date" msgstr "Dernière mise à jour: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-ga.po b/modules/oe_theme_helper/translations/oe_theme_helper-ga.po index 767af6578..516f1b15e 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-ga.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-ga.po @@ -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:
@name" +msgstr "Tá an suíomh seo á bhainistiú ag:
@name" msgid "Last updated on: @date" msgstr "An uair dheiridh a nuashonraíodh: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-hr.po b/modules/oe_theme_helper/translations/oe_theme_helper-hr.po index f3b57b08f..05012dfbe 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-hr.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-hr.po @@ -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:
@name" +msgstr "Ovim internetskim stranicama upravlja:
@name" msgid "Last updated on: @date" msgstr "Posljednji put ažurirano: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-hu.po b/modules/oe_theme_helper/translations/oe_theme_helper-hu.po index aef890582..7d328c65c 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-hu.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-hu.po @@ -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:
@name" +msgstr "A webhely üzemeltetője:
@name" msgid "Last updated on: @date" msgstr "Legutóbbi frissítés: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-it.po b/modules/oe_theme_helper/translations/oe_theme_helper-it.po index 2eec38f5e..69b20f7d7 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-it.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-it.po @@ -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:
@name" +msgstr "Il sito è gestito da:
@name" msgid "Last updated on: @date" msgstr "Ultimo aggiornamento: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-lt.po b/modules/oe_theme_helper/translations/oe_theme_helper-lt.po index 632dca855..14e1ddf43 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-lt.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-lt.po @@ -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:
@name" +msgstr "Šią svetainę tvarko:
@name" msgid "Last updated on: @date" msgstr "Paskutinį kartą atnaujinta: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-lv.po b/modules/oe_theme_helper/translations/oe_theme_helper-lv.po index 14d2f8b55..7d018cec0 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-lv.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-lv.po @@ -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:
@name" +msgstr "Šo vietni pārvalda:
@name" msgid "Last updated on: @date" msgstr "Pēdējoreiz atjaunināts: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-mt.po b/modules/oe_theme_helper/translations/oe_theme_helper-mt.po index a993cd81d..7e469c0a6 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-mt.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-mt.po @@ -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:
@name" +msgstr "Dan is-sit hu mmaniġġjat minn:
@name" msgid "Last updated on: @date" msgstr "L-aħħar aġġornament: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-nl.po b/modules/oe_theme_helper/translations/oe_theme_helper-nl.po index df5b78f07..1742b70e3 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-nl.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-nl.po @@ -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:
@name" +msgstr "Deze site wordt beheerd door:
@name" msgid "Last updated on: @date" msgstr "Laatste update: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-pl.po b/modules/oe_theme_helper/translations/oe_theme_helper-pl.po index 72c5253b1..0026aaac8 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-pl.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-pl.po @@ -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:
@name" +msgstr "Stroną zarządza:
@name" msgid "Last updated on: @date" msgstr "Ostatnia aktualizacja: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-pt-pt.po b/modules/oe_theme_helper/translations/oe_theme_helper-pt-pt.po index a09ab0bb7..e66ecc210 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-pt-pt.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-pt-pt.po @@ -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:
@name" +msgstr "Este sítio Web é gerido por:
@name" msgid "Last updated on: @date" msgstr "Última atualização em: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-ro.po b/modules/oe_theme_helper/translations/oe_theme_helper-ro.po index 8d2cd2415..b9375693b 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-ro.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-ro.po @@ -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:
@name" +msgstr "Acest site este administrat de:
@name" msgid "Last updated on: @date" msgstr "Ultima actualizare: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-sk.po b/modules/oe_theme_helper/translations/oe_theme_helper-sk.po index 3e01857fa..85e857811 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-sk.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-sk.po @@ -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:
@name" +msgstr "Túto stránku spravuje:
@name" msgid "Last updated on: @date" msgstr "Naposledy aktualizované: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-sl.po b/modules/oe_theme_helper/translations/oe_theme_helper-sl.po index 569d2f19e..63b7293ce 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-sl.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-sl.po @@ -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:
@name" +msgstr "Spletišče upravlja:
@name" msgid "Last updated on: @date" msgstr "Zadnja posodobitev: @date" diff --git a/modules/oe_theme_helper/translations/oe_theme_helper-sv.po b/modules/oe_theme_helper/translations/oe_theme_helper-sv.po index 5d7986e6e..7936a94f7 100644 --- a/modules/oe_theme_helper/translations/oe_theme_helper-sv.po +++ b/modules/oe_theme_helper/translations/oe_theme_helper-sv.po @@ -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:
@name" +msgstr "Den här webbplatsen sköts av
@name" msgid "Last updated on: @date" msgstr "Senaste uppdatering: @date" diff --git a/templates/blocks/block--system-branding-block.html.twig b/templates/blocks/block--system-branding-block.html.twig index ff681b0fe..563d6c5ba 100644 --- a/templates/blocks/block--system-branding-block.html.twig +++ b/templates/blocks/block--system-branding-block.html.twig @@ -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, }, }) %} diff --git a/templates/navigation/oe-corporate-blocks-ec-footer--core.html.twig b/templates/navigation/oe-corporate-blocks-ec-footer--core.html.twig index 38cd5521a..13782f0dc 100644 --- a/templates/navigation/oe-corporate-blocks-ec-footer--core.html.twig +++ b/templates/navigation/oe-corporate-blocks-ec-footer--core.html.twig @@ -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:
@name'|t({'@name': site_owner}), }, ] %} {% set _second_column = [ diff --git a/templates/navigation/oe-corporate-blocks-ec-footer--standardised.html.twig b/templates/navigation/oe-corporate-blocks-ec-footer--standardised.html.twig index 224be6b8c..a26ccd251 100644 --- a/templates/navigation/oe-corporate-blocks-ec-footer--standardised.html.twig +++ b/templates/navigation/oe-corporate-blocks-ec-footer--standardised.html.twig @@ -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 %} @@ -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, }]) %} @@ -82,7 +82,7 @@ 'path': url(''), } }, - 'description': site_owner ? 'This site is managed by: @name'|t({'@name': site_owner}), + 'description': site_owner ? 'This site is managed by:
@name'|t({'@name': site_owner}), 'links': _top_row_links, 'section_class_name': 'ecl-site-footer__section--site-info', } diff --git a/templates/navigation/oe-corporate-blocks-eu-footer--core.html.twig b/templates/navigation/oe-corporate-blocks-eu-footer--core.html.twig index ba0515b47..efab938d8 100644 --- a/templates/navigation/oe-corporate-blocks-eu-footer--core.html.twig +++ b/templates/navigation/oe-corporate-blocks-eu-footer--core.html.twig @@ -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:
@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), }, ], diff --git a/templates/navigation/oe-corporate-blocks-eu-footer--standardised.html.twig b/templates/navigation/oe-corporate-blocks-eu-footer--standardised.html.twig index 5ac1277d5..dac5a1070 100644 --- a/templates/navigation/oe-corporate-blocks-eu-footer--standardised.html.twig +++ b/templates/navigation/oe-corporate-blocks-eu-footer--standardised.html.twig @@ -38,7 +38,7 @@ 'path': url(''), } }, - 'description': site_owner ? 'This site is managed by: @name'|t({'@name': site_owner}), + 'description': site_owner ? 'This site is managed by:
@name'|t({'@name': site_owner}), 'links': _top_row_links, 'section_class_name': 'ecl-site-footer__section--site-info', } @@ -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, } ], ] %} diff --git a/templates/patterns/social_icon/pattern-social-icon.html.twig b/templates/patterns/social_icon/pattern-social-icon.html.twig index 8744523bb..a87a88f39 100644 --- a/templates/patterns/social_icon/pattern-social-icon.html.twig +++ b/templates/patterns/social_icon/pattern-social-icon.html.twig @@ -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 %} diff --git a/templates/patterns/social_media_links/pattern-social-media-links.html.twig b/templates/patterns/social_media_links/pattern-social-media-links.html.twig index 15ebef7e8..fac4ac067 100644 --- a/templates/patterns/social_media_links/pattern-social-media-links.html.twig +++ b/templates/patterns/social_media_links/pattern-social-media-links.html.twig @@ -19,7 +19,7 @@ icon: { path: ecl_icon_social_media_path, name: link.service, - size: 'l' + size: 'xs' } }) %} {% endif %} diff --git a/tests/src/Functional/CorporateFooterRenderTest.php b/tests/src/Functional/CorporateFooterRenderTest.php index 9889e45f2..df4793a0f 100644 --- a/tests/src/Functional/CorporateFooterRenderTest.php +++ b/tests/src/Functional/CorporateFooterRenderTest.php @@ -139,7 +139,7 @@ public function testCorporateFooterRendering(): void { $this->drupalGet(''); $actual = $assert->elementExists('css', 'div.ecl-site-footer__description'); - $this->assertEquals('This site is managed by: ACP–EU Joint Assembly', $actual->getText()); + $this->assertEquals('This site is managed by:ACP–EU Joint Assembly', $actual->getText()); // Test European Commission footer standardised block rendering. $this->branding = 'standardised'; @@ -167,7 +167,7 @@ public function testCorporateFooterRendering(): void { $this->assertEquals('http://web:8080/build/', $actual->getAttribute('href')); $actual = $section->find('css', 'div.ecl-site-footer__description'); - $this->assertEquals('This site is managed by: ACP–EU Joint Assembly', $actual->getText()); + $this->assertEquals('This site is managed by:ACP–EU Joint Assembly', $actual->getText()); $actual = $section->find('css', '.ecl-site-footer__section--site-info a.ecl-link.ecl-link--standalone.ecl-site-footer__link'); $this->assertEquals('Accessibility', $actual->getText()); $this->assertEquals('/build/', $actual->getAttribute('href')); @@ -205,7 +205,7 @@ public function testCorporateFooterRendering(): void { $this->assertEquals('http://web:8080/build/', $actual->getAttribute('href')); $actual = $section->find('css', 'div.ecl-site-footer__description'); - $this->assertEquals('This site is managed by: DG XI – Internal Market', $actual->getText()); + $this->assertEquals('This site is managed by:DG XI – Internal Market', $actual->getText()); // Test European Union footer core block rendering. $this->branding = 'core'; @@ -225,7 +225,7 @@ public function testCorporateFooterRendering(): void { $section = $assert->elementExists('css', 'footer.ecl-site-footer div.ecl-site-footer__column:nth-child(1) div.ecl-site-footer__section:nth-child(1)'); $actual = $assert->elementExists('css', 'div.ecl-site-footer__description'); - $this->assertEquals('This site is managed by: DG XI – Internal Market', $actual->getText()); + $this->assertEquals('This site is managed by:DG XI – Internal Market', $actual->getText()); // Accessibility link should not be displayed on core. $this->assertCount(0, $section->findAll('css', 'a.ecl-link.ecl-link--standalone.ecl-site-footer__link')); @@ -288,7 +288,7 @@ public function testCorporateFooterRendering(): void { $this->drupalGet(''); $actual = $assert->elementExists('css', 'div.ecl-site-footer__description'); - $this->assertEquals('This site is managed by: Directorate-General for Budget', $actual->getText()); + $this->assertEquals('This site is managed by:Directorate-General for Budget', $actual->getText()); // Test European Union footer standardised block rendering. $this->branding = 'standardised'; @@ -310,7 +310,7 @@ public function testCorporateFooterRendering(): void { $this->assertEquals('http://web:8080/build/', $actual->getAttribute('href')); $actual = $assert->elementExists('css', 'div.ecl-site-footer__description'); - $this->assertEquals('This site is managed by: Directorate-General for Budget', $actual->getText()); + $this->assertEquals('This site is managed by:Directorate-General for Budget', $actual->getText()); $actual = $section->find('css', '.ecl-site-footer__section--site-info a.ecl-link.ecl-link--standalone.ecl-site-footer__link'); $this->assertEquals('Accessibility', $actual->getText()); $this->assertEquals('/build/', $actual->getAttribute('href')); @@ -413,10 +413,6 @@ public function testCorporateFooterRendering(): void { $this->assertEquals('Contact us', $actual->getText()); $actual = $subsection->find('css', 'ul li:nth-child(1) > a'); - $expected = [ - 'label' => 'Custom contact 1', - 'href' => 'http://example.com/custom-contact-1', - ]; $this->assertListLink($actual, $expected, TRUE); // We should have the external icon present. $icon = $actual->find('css', 'svg.ecl-icon.ecl-icon--xs.ecl-link__icon use'); diff --git a/tests/src/Functional/SiteHeaderTest.php b/tests/src/Functional/SiteHeaderTest.php index b37ada586..63ee19743 100644 --- a/tests/src/Functional/SiteHeaderTest.php +++ b/tests/src/Functional/SiteHeaderTest.php @@ -126,7 +126,7 @@ public function testSiteHeader(): void { ->getAttribute('srcset')); $this->assertEquals('(min-width: 996px)', $picture->find('css', 'source') ->getAttribute('media')); - $this->assertStringContainsString('oe_theme/dist/ec/images/logo/positive/logo-ec--en.svg', $picture->find('css', 'img.ecl-site-header__logo-image') + $this->assertStringContainsString('oe_theme/dist/ec/images/logo/logo-ec--mute.svg', $picture->find('css', 'img.ecl-site-header__logo-image') ->getAttribute('src')); $this->assertEquals('European Commission logo', $picture->find('css', 'img.ecl-site-header__logo-image') ->getAttribute('alt')); diff --git a/tests/src/PatternAssertions/SocialMediaLinksAssert.php b/tests/src/PatternAssertions/SocialMediaLinksAssert.php index f64a4c805..015d1c5de 100644 --- a/tests/src/PatternAssertions/SocialMediaLinksAssert.php +++ b/tests/src/PatternAssertions/SocialMediaLinksAssert.php @@ -93,7 +93,7 @@ protected function assertLinks(array $expected_items, Crawler $crawler): void { // Service icon exists. $link_element = $li_item->filter('a.ecl-link.ecl-link--standalone.ecl-link--icon.ecl-social-media-follow__link'); $label_element = $link_element->filter('span.ecl-link__label'); - $svg = $link_element->filter('svg.ecl-icon.ecl-icon--l.ecl-link__icon use'); + $svg = $link_element->filter('svg.ecl-icon.ecl-icon--xs.ecl-link__icon use'); self::assertStringContainsString('icons-social-media.svg#' . $expected_item['service'], $svg->attr('xlink:href')); }