diff --git a/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap b/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap index d4dd62340..3bf948d05 100644 --- a/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap +++ b/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap @@ -42,7 +42,6 @@ exports[`OE - Contact-form contact-form error page renders correctly 1`] = ` - - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + Home + + + + + + + +
- - -
+ +
+
- + + Home + + + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- - -
+ +
+
- + + + About the European Union + + + + + +
- -
-
- - project logo - - Project name - - -
-
- -
+ +
+
- + + + About the European Union + + + + + +
- -
-
- project logo - - Project name - -
-
- -
+ +
+
- + + + About the European Union + + + + + +
- -
-
- - Project name - -
-
- -
+ +
+
- + + + About the European Union + + + + + +
- -
-
- ucpkn logo - - UCP Knowledge Network: Applied knowledge for action - -
-
- + `; diff --git a/src/compositions/bcl-header/header.html.twig b/src/compositions/bcl-header/header.html.twig index edb7dfaf4..cea9aa5ab 100644 --- a/src/compositions/bcl-header/header.html.twig +++ b/src/compositions/bcl-header/header.html.twig @@ -84,41 +84,6 @@ - - - {% if _project_logo is not empty or _site_name is not empty %} -
-
- {% if _project_link is not empty %} - - {% endif %} - {% if _project_logo is not empty %} - {{ _project_logo.alt }} - {% endif %} - {% if _site_name is not empty %} - - {{- _site_name -}} - - {% endif %} - {% if _project_link is not empty %} - - {% endif %} -
-
- {% endif %} - {% if _navbar is not empty %} {% include '@oe-bcl/bcl-navbar/navbar.html.twig' with _navbar|merge({ @@ -126,15 +91,15 @@ attributes: create_attribute().addClass('bcl-header__navbar collapse navbar-collapse').setAttribute('id', _navbar_id).setAttribute('aria-label', 'Main Navigation'), }) only %} {% endif %} - - - {% if _breadcrumbs is not empty %} -
- {% include '@oe-bcl/bcl-breadcrumb/breadcrumb.html.twig' with _breadcrumbs only %} -
- {% endif %} + +{% if _breadcrumbs is not empty %} +
+ {% include '@oe-bcl/bcl-breadcrumb/breadcrumb.html.twig' with _breadcrumbs only %} +
+{% endif %} + {% for modal in _modals %} {% include '@oe-bcl/bcl-modal/modal.html.twig' with modal only %} {% endfor %} diff --git a/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap b/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap index fb2116062..0d7742a63 100644 --- a/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap +++ b/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap @@ -42,7 +42,6 @@ exports[`OE - Landing page renders correctly 1`] = ` - - -
+ +
+
- + + + About the European Union + + + + + +
  • -
  • +
    + - + More of submenu item 3 + + - - More of submenu item 3 - - - - - -
  • - + + + +
  • {{- _see_all.label -}} {% endset %} {% set _see_all_attr = (_see_all.attributes is defined ? _see_all.attributes : create_attribute()) %} - {% set _see_all = _see_all|merge({ + {% set _see_all_link = _see_all|merge({ label: _see_all_label, icon: { + size: 'xs', name: 'arrow-right', path: _icon_path, }, - li_attributes: create_attribute() - .addClass('__see_all'), attributes: _see_all_attr .addClass(['see-all-button']) .setAttribute('aria-label', 'See all items in ‘' ~ _trigger.label ~ '’') }) %} - {% set _items = _items|merge([_see_all]) %} {% endif %} {% set submenu_attributes = create_attribute() .setAttribute('id', _panel_id) @@ -60,6 +58,11 @@ icon_path: _icon_path, level: _level, } only %} + {% if _see_all_link %} +
    + {% include '@oe-bcl/bcl-link/link.html.twig' with _see_all_link only %} +
    + {% endif %} {% endapply %} diff --git a/src/compositions/bcl-news/__snapshots__/news.test.js.snap b/src/compositions/bcl-news/__snapshots__/news.test.js.snap index deb10fee8..0b44da9fa 100644 --- a/src/compositions/bcl-news/__snapshots__/news.test.js.snap +++ b/src/compositions/bcl-news/__snapshots__/news.test.js.snap @@ -42,7 +42,6 @@ exports[`OE - News full page renders correctly 1`] = ` -
  • -
  • +
  • - + + + +
  • - -
    + + - + + + About the European Union + +
  • + + + + - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - -
    -
    - ucpkn logo - - UCP Knowledge Network: Applied knowledge for action - -
    -
    - +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +
    - - -
    + + - + + + About the European Union + + + + + +