Skip to content

Commit

Permalink
Merge pull request #1493 from openeuropa/EWPP-4689
Browse files Browse the repository at this point in the history 
EWPP-4689: Update to ECL 4.6.1.
  • Loading branch information
@nagyad
nagyad authored Aug 28, 2024
2 parents 64d7170 + 9b792ae commit 27c78ab
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 71 deletions.
100 changes: 50 additions & 50 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,57 +14,57 @@
"prepare": "patch-package"
},
"dependencies": {
"@ecl/builder": "4.6.0",
"@ecl/preset-ec": "4.6.0",
"@ecl/preset-eu": "4.6.0",
"@ecl/preset-reset": "4.6.0",
"@ecl/builder": "4.6.1",
"@ecl/preset-ec": "4.6.1",
"@ecl/preset-eu": "4.6.1",
"@ecl/preset-reset": "4.6.1",
"@ecl/stylelint-config": "0.2.1",
"@ecl/theme-ec": "4.6.0",
"@ecl/theme-eu": "4.6.0",
"@ecl/twig-component-accordion": "4.6.0",
"@ecl/twig-component-banner": "4.6.0",
"@ecl/twig-component-blockquote": "4.6.0",
"@ecl/twig-component-breadcrumb": "4.6.0",
"@ecl/twig-component-button": "4.6.0",
"@ecl/twig-component-card": "4.6.0",
"@ecl/twig-component-carousel": "4.6.0",
"@ecl/twig-component-content-item": "4.6.0",
"@ecl/twig-component-datepicker": "4.6.0",
"@ecl/twig-component-description-list": "4.6.0",
"@ecl/twig-component-expandable": "4.6.0",
"@ecl/twig-component-fact-figures": "4.6.0",
"@ecl/twig-component-featured-item": "4.6.0",
"@ecl/twig-component-file": "4.6.0",
"@ecl/twig-component-gallery": "4.6.0",
"@ecl/twig-component-icon": "4.6.0",
"@ecl/twig-component-inpage-navigation": "4.6.0",
"@ecl/twig-component-label": "4.6.0",
"@ecl/twig-component-link": "4.6.0",
"@ecl/twig-component-list-illustration": "4.6.0",
"@ecl/twig-component-media-container": "4.6.0",
"@ecl/twig-component-mega-menu": "4.6.0",
"@ecl/twig-component-menu": "4.6.0",
"@ecl/twig-component-navigation-list": "4.6.0",
"@ecl/twig-component-news-ticker": "4.6.0",
"@ecl/twig-component-notification": "4.6.0",
"@ecl/twig-component-page-header": "4.6.0",
"@ecl/twig-component-pagination": "4.6.0",
"@ecl/twig-component-radio": "4.6.0",
"@ecl/twig-component-search-form": "4.6.0",
"@ecl/twig-component-select": "4.6.0",
"@ecl/twig-component-site-footer": "4.6.0",
"@ecl/twig-component-site-header": "4.6.0",
"@ecl/twig-component-skip-link": "4.6.0",
"@ecl/twig-component-social-media-follow": "4.6.0",
"@ecl/twig-component-social-media-share": "4.6.0",
"@ecl/twig-component-splash-page": "4.6.0",
"@ecl/twig-component-table": "4.6.0",
"@ecl/twig-component-tabs": "4.6.0",
"@ecl/twig-component-tag": "4.6.0",
"@ecl/twig-component-text-input": "4.6.0",
"@ecl/twig-component-timeline": "4.6.0",
"@ecl/vanilla-utility-background": "4.6.0",
"@ecl/vanilla-utility-border": "4.6.0",
"@ecl/theme-ec": "4.6.1",
"@ecl/theme-eu": "4.6.1",
"@ecl/twig-component-accordion": "4.6.1",
"@ecl/twig-component-banner": "4.6.1",
"@ecl/twig-component-blockquote": "4.6.1",
"@ecl/twig-component-breadcrumb": "4.6.1",
"@ecl/twig-component-button": "4.6.1",
"@ecl/twig-component-card": "4.6.1",
"@ecl/twig-component-carousel": "4.6.1",
"@ecl/twig-component-content-item": "4.6.1",
"@ecl/twig-component-datepicker": "4.6.1",
"@ecl/twig-component-description-list": "4.6.1",
"@ecl/twig-component-expandable": "4.6.1",
"@ecl/twig-component-fact-figures": "4.6.1",
"@ecl/twig-component-featured-item": "4.6.1",
"@ecl/twig-component-file": "4.6.1",
"@ecl/twig-component-gallery": "4.6.1",
"@ecl/twig-component-icon": "4.6.1",
"@ecl/twig-component-inpage-navigation": "4.6.1",
"@ecl/twig-component-label": "4.6.1",
"@ecl/twig-component-link": "4.6.1",
"@ecl/twig-component-list-illustration": "4.6.1",
"@ecl/twig-component-media-container": "4.6.1",
"@ecl/twig-component-mega-menu": "4.6.1",
"@ecl/twig-component-menu": "4.6.1",
"@ecl/twig-component-navigation-list": "4.6.1",
"@ecl/twig-component-news-ticker": "4.6.1",
"@ecl/twig-component-notification": "4.6.1",
"@ecl/twig-component-page-header": "4.6.1",
"@ecl/twig-component-pagination": "4.6.1",
"@ecl/twig-component-radio": "4.6.1",
"@ecl/twig-component-search-form": "4.6.1",
"@ecl/twig-component-select": "4.6.1",
"@ecl/twig-component-site-footer": "4.6.1",
"@ecl/twig-component-site-header": "4.6.1",
"@ecl/twig-component-skip-link": "4.6.1",
"@ecl/twig-component-social-media-follow": "4.6.1",
"@ecl/twig-component-social-media-share": "4.6.1",
"@ecl/twig-component-splash-page": "4.6.1",
"@ecl/twig-component-table": "4.6.1",
"@ecl/twig-component-tabs": "4.6.1",
"@ecl/twig-component-tag": "4.6.1",
"@ecl/twig-component-text-input": "4.6.1",
"@ecl/twig-component-timeline": "4.6.1",
"@ecl/vanilla-utility-background": "4.6.1",
"@ecl/vanilla-utility-border": "4.6.1",
"chokidar-cli": "3.0.0",
"grunt": "1.6.1",
"grunt-contrib-copy": "1.0.0",
Expand Down
0 ...+twig-component-content-block+4.6.0.patch → ...+twig-component-content-block+4.6.1.patch
View file
File renamed without changes.
0 patches/@ecl+twig-component-file+4.6.0.patch → patches/@ecl+twig-component-file+4.6.1.patch
View file
File renamed without changes.
0 patches/@ecl+twig-component-tabs+4.6.0.patch → patches/@ecl+twig-component-tabs+4.6.1.patch
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion sass/components/_global.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ body {

a {
text-decoration: none;
color: var(--ecl-color-primary-100);
&:hover,
&:focus {
text-decoration: underline;
}
color: var(--ecl-color-primary-100);
}

.ecl {
Expand Down
5 changes: 1 addition & 4 deletions templates/patterns/navigation_menu/pattern-navigation-menu.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@
{% include '@ecl-twig/menu' with {
title: label|default('Menu'|t),
toggle: {
link: {
label: label|default('Menu'|t),
hide_label: true
},
label: label|default('Menu'|t),
icon: {
path: ecl_icon_path,
name: 'hamburger',
Expand Down
4 changes: 2 additions & 2 deletions tests/src/Functional/SiteHeaderTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ public function testSiteHeader(): void {

// Assert the menu container.
$menu_container = $assert->elementExists('css', 'nav div.ecl-container.ecl-menu__container', $main_menu);
$this->assertStringContainsString('Menu', $menu_container->find('css', "a.ecl-link.ecl-link--standalone.ecl-menu__open[href][data-ecl-menu-open] span.ecl-link__label")
$this->assertStringContainsString('Menu', $menu_container->find('css', "button.ecl-button--tertiary.ecl-menu__open.ecl-button--icon-only[data-ecl-menu-open] span.ecl-button__label")
->getText());
$icon = $menu_container->find('css', "a.ecl-menu__open svg.ecl-icon.ecl-icon--m[focusable='false'][aria-hidden='true']");
$icon = $menu_container->find('css', "button.ecl-menu__open svg.ecl-icon.ecl-icon--m[focusable='false'][aria-hidden='true']");
$this->assertEquals('<use xlink:href="/build/themes/custom/oe_theme/dist/' . $component . '/images/icons/sprites/icons.svg#hamburger" xmlns:xlink="http://www.w3.org/1999/xlink"></use>', $icon->getHtml());
$assert->elementExists('css', "section.ecl-menu__inner[data-ecl-menu-inner]", $menu_container);
$assert->elementExists('css', 'section header.ecl-menu__inner-header', $menu_container);
Expand Down
28 changes: 14 additions & 14 deletions tests/src/Kernel/fixtures/rendering.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@
'svg.ecl-icon.ecl-icon--xs.ecl-icon--rotate-90.ecl-link__icon': 1
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'.ecl-banner--full-width': 0
'footer.ecl-banner__credit small': 1
'footer.ecl-banner__credit div.ecl-container': 1
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
'a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-banner__link-cta[href="http://example.com"] span.ecl-link__label': Subscribe
'footer.ecl-banner__credit small': © Copyright or credit
'footer.ecl-banner__credit div.ecl-container': © Copyright or credit
- array:
'#type': pattern
'#id': banner
Expand All @@ -268,7 +268,7 @@
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text a.ecl-link.ecl-link--icon.ecl-banner__title-link[data-name="data value"]': 1
'svg.ecl-icon.ecl-icon--xs.ecl-icon--rotate-90.ecl-link__icon': 1
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'footer.ecl-banner__credit small': 1
'footer.ecl-banner__credit div.ecl-container': 1
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text a[href="http://example.com"] span.ecl-link__label': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
Expand Down Expand Up @@ -298,7 +298,7 @@
'svg.ecl-icon.ecl-icon--xs.ecl-icon--rotate-90.ecl-link__icon': 1
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'.ecl-banner--full-width': 0
'footer.ecl-banner__credit small': 0
'footer.ecl-banner__credit div.ecl-container': 0
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text a[href="http://example.com"] span.ecl-link__label': Banner description
- array:
Expand All @@ -324,7 +324,7 @@
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'picture source': 0
'.ecl-banner--full-width': 0
'footer.ecl-banner__credit small': 0
'footer.ecl-banner__credit div.ecl-container': 0
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
Expand Down Expand Up @@ -368,12 +368,12 @@
'picture source[srcset="https://picsum.photos/seed/picsum/996/996"][media="(max-width: 996px)"]': 1
'picture source[srcset="https://loremflickr.com/1140/380/brazil"][media="(max-width: 1140px)"]': 1
'picture source[srcset="https://inno-ecl.s3.amazonaws.com/media/examples/example-image.jpg"][media="(min-width: 1140px)"]': 1
'footer.ecl-banner__credit small': 1
'footer.ecl-banner__credit div.ecl-container': 1
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
'a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-banner__link-cta[href="http://example.com"] span.ecl-link__label': Example
'footer.ecl-banner__credit small': © Copyright or credit
'footer.ecl-banner__credit div.ecl-container': © Copyright or credit
- array:
'#type': pattern
'#id': banner
Expand All @@ -393,7 +393,7 @@
'div.ecl-banner__content div.ecl-banner__cta a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-banner__link-cta[href="http://example.com"]': 1
'svg.ecl-icon.ecl-icon--xs.ecl-icon--rotate-90.ecl-link__icon': 1
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'footer.ecl-banner__credit small': 1
'footer.ecl-banner__credit div.ecl-container': 1
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
Expand Down Expand Up @@ -425,7 +425,7 @@
'div.ecl-banner__content div.ecl-banner__cta a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-banner__link-cta[data-name="data value"]': 1
'svg.ecl-icon.ecl-icon--xs.ecl-icon--rotate-90.ecl-link__icon': 1
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'footer.ecl-banner__credit small': 1
'footer.ecl-banner__credit div.ecl-container': 1
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
Expand Down Expand Up @@ -459,7 +459,7 @@
'div.ecl-banner__content div.ecl-banner__cta a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-banner__link-cta[data-name="data value"]': 1
'svg.ecl-icon.ecl-icon--xs.ecl-icon--rotate-90.ecl-link__icon': 1
'picture.ecl-picture.ecl-banner__picture img.ecl-banner__image[src="http://via.placeholder.com/150x150"]': 1
'footer.ecl-banner__credit small': 1
'footer.ecl-banner__credit div.ecl-container': 1
equals:
'div.ecl-container div.ecl-banner__container div.ecl-banner__content div.ecl-banner__title span.ecl-banner__title-text': Banner title
'div.ecl-container div.ecl-banner__container div.ecl-banner__content p.ecl-banner__description span.ecl-banner__description-text': Banner description
Expand Down Expand Up @@ -3433,9 +3433,9 @@
"li.ecl-menu__item:nth-child(1) button[aria-label=\"Access item's children\"]": 1
"li.ecl-menu__item:nth-child(2) button[aria-label=\"Access item's children\"]": 1
"div.ecl-container.ecl-menu__container section.ecl-menu__inner[data-ecl-menu-inner]": 1
"a.ecl-link--standalone.ecl-button.ecl-button--tertiary.ecl-menu__open.ecl-link--icon-only": 1
"button.ecl-button--tertiary.ecl-menu__open.ecl-button--icon-only": 1
equals:
'a.ecl-menu__open.ecl-link--icon-only span.ecl-link__label': 'Menu'
'button.ecl-menu__open.ecl-button--icon-only span.ecl-button__label': 'Menu'
'.ecl-menu__inner-header button.ecl-menu__close[data-ecl-menu-close] span.ecl-button__label': "Close"
'.ecl-menu__inner-header button.ecl-menu__back[data-ecl-menu-back] .ecl-button__label': "Back"
'li.ecl-menu__item.ecl-menu__item--has-children:nth-child(1) a.ecl-menu__link': "Parent 1"
Expand Down Expand Up @@ -3485,7 +3485,7 @@
"nav.ecl-menu[data-ecl-menu][data-ecl-menu-max-lines=\"3\"][data-ecl-auto-init=\"Menu\"][aria-expanded=\"false\"][role=\"navigation\"][aria-label=\"Site navigation\"]": 1
"li.ecl-menu__item:nth-child(1) button[aria-label=\"Access item's children\"]": 1
equals:
'.ecl-menu__open .ecl-link__label': "Custom Menu"
'button.ecl-menu__open span.ecl-button__label': "Custom Menu"
'.ecl-menu__inner-header button.ecl-menu__close[data-ecl-menu-close] span.ecl-button__label': "Close"
'.ecl-menu__inner-header button.ecl-menu__back[data-ecl-menu-back] .ecl-button__label': "Back"
'li.ecl-menu__item:nth-child(1) a.ecl-menu__link': "Parent 1"
Expand Down Expand Up @@ -4148,7 +4148,7 @@
div.ecl-carousel__slide section.ecl-banner--text-box.ecl-banner--m:not(.ecl-banner--h-center) div.ecl-banner__content div.ecl-banner__title .ecl-banner__title-text: 'Lorem ipsum dolor sit amet'
div.ecl-carousel__slide section.ecl-banner--text-box.ecl-banner--m:not(.ecl-banner--h-center) div.ecl-banner__content p.ecl-banner__description .ecl-banner__description-text: 'Nullam sollicitudin suscipit diam, ac blandit ipsum tempor consectetur'
div.ecl-carousel__slide section.ecl-banner--text-box.ecl-banner--m:not(.ecl-banner--h-center) div.ecl-banner__content div.ecl-banner__cta a[href="https://example.com"] span.ecl-link__label: 'CTA 1'
div.ecl-carousel__slide section.ecl-banner--text-box.ecl-banner--m:not(.ecl-banner--h-center) footer.ecl-banner__credit small: '© Copyright first item'
div.ecl-carousel__slide section.ecl-banner--text-box.ecl-banner--m:not(.ecl-banner--h-center) footer.ecl-banner__credit div.ecl-container: '© Copyright first item'
div.ecl-carousel__slide section.ecl-banner.ecl-banner--text-overlay.ecl-banner--h-center div.ecl-banner__title .ecl-banner__title-text: 'Duis vitae pulvinar turpis'
div.ecl-carousel__slide section.ecl-banner.ecl-banner--text-overlay.ecl-banner--h-center p.ecl-banner__description .ecl-banner__description-text: 'Integer quis lorem tellus. Nullam sollicitudin suscipit diam, ac blandit ipsum tempor consectetur'
div.ecl-carousel__slide section.ecl-banner.ecl-banner--text-overlay.ecl-banner--h-center div.ecl-banner__cta a[href="https://example.com"] span.ecl-link__label: 'CTA 2'
Expand Down

0 comments on commit 27c78ab

Please sign in to comment.