From cbc9570eb3ec2131c60aa5beb84a4a7117e005ff Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Wed, 22 Oct 2025 10:29:59 +0300 Subject: [PATCH 01/15] OEL-4185: Fixed mega menu and update header. --- .../__snapshots__/contact-form.test.js.snap | 291 ++++++------ .../__snapshots__/event.test.js.snap | 202 +++++---- .../__snapshots__/glossary.test.js.snap | 210 +++++---- .../__snapshots__/group.test.js.snap | 388 ++++++++-------- .../__snapshots__/header.test.js.snap | 365 ++++++--------- src/compositions/bcl-header/header.html.twig | 49 +- .../__snapshots__/landing-page.test.js.snap | 97 ++-- .../bcl-news/__snapshots__/news.test.js.snap | 202 +++++---- .../bcl-page/__snapshots__/page.test.js.snap | 97 ++-- .../__snapshots__/person.test.js.snap | 202 +++++---- .../__snapshots__/procurement.test.js.snap | 291 ++++++------ .../__snapshots__/project.test.js.snap | 425 +++++++++--------- .../__snapshots__/publication.test.js.snap | 291 ++++++------ .../__snapshots__/search.test.js.snap | 97 ++-- .../__snapshots__/subscription.test.js.snap | 97 ++-- .../bcl-user/__snapshots__/user.test.js.snap | 291 ++++++------ .../__snapshots__/vacancy.test.js.snap | 291 ++++++------ src/themes/default/src/scss/_header.scss | 2 +- src/themes/default/src/scss/_mega-menu.scss | 15 + 19 files changed, 1877 insertions(+), 2026 deletions(-) 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..b68d1ad18 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 + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + Home + + +
  • + + European Union + +
    • +
  • + + + + + About the European Union + +
    • +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + Home + + +
  • + + European Union + +
    • +
  • + + + + + About the European Union + +
    • +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - -
    -
    - - project logo - - Project name - - -
    -
    - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - -
    -
    - project logo - - Project name - -
    -
    - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - -
    -
    - - Project name - -
    -
    - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - -
    -
    - 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..a44457abc 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 + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - -
    -
    - ucpkn logo - - UCP Knowledge Network: Applied knowledge for action - -
    -
    - +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - - -
    + +
    +
    - + + + About the European Union + + +
  • + News +
    • + + +
    - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - + +
    -
    • - + +
  • - +
  • + + Sub-submenu item 5.1 (nolink) + +
    • +
  • + + Sub-submenu item 5.2 + +
    • + + +
  • {{- _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) @@ -55,11 +53,20 @@

    {{ _trigger.label }}

    {% endif %} - {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with { - items: _items, - icon_path: _icon_path, - level: _level, - } only %} +
    +
    + {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with { + items: _items, + 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 693fbf624..d748e298e 100644 --- a/src/compositions/bcl-news/__snapshots__/news.test.js.snap +++ b/src/compositions/bcl-news/__snapshots__/news.test.js.snap @@ -178,48 +178,56 @@ exports[`OE - News full page renders correctly 1`] = ` Base Category Item

    - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • - + +
    -
    • - + +
  • - +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • +
  • + + Base Sub Category Item + +
    • + + +
  • svg { + flex-shrink: 0; + } + > span { + text-overflow: ellipsis; + overflow: hidden; + display: block; + white-space: nowrap; + } + } @include media-breakpoint-up(lg) { block-size: $mm-panel-height; overflow-y: auto; + .__level-2 { + block-size: 240px; + } } // Add space above in mobile viewport. @include media-breakpoint-down(lg) { @@ -275,34 +323,6 @@ ul.bcl-mega-menu__items { } } } - - // The see-all link is at the bottom of the list. - &:has(> a.see-all-button) { - position: sticky; - inset-block-start: 100%; - } - > a.see-all-button { - border-top: none; - &:after { - background: $neutral-border-color; - content: ""; - block-size: 1px; - inset-inline-start: 0; - position: absolute; - inset-block-start: 0; - // Replicate horizontal padding of parent element. - inset-inline: $mm-gutter-x; - } - > svg { - inline-size: 0.8rem; - } - > span { - text-overflow: ellipsis; - overflow: hidden; - display: block; - white-space: nowrap; - } - } } } diff --git a/src/themes/default/storybook/.storybook/environment.js b/src/themes/default/storybook/.storybook/environment.js index d3a84e502..aa0c8efe9 100644 --- a/src/themes/default/storybook/.storybook/environment.js +++ b/src/themes/default/storybook/.storybook/environment.js @@ -6,17 +6,7 @@ const { createFilesystemLoader, createFunction, } = require("twing"); -const storybookAttributePath = path.resolve( - __dirname, - "..", - "..", - "..", - "..", - "..", - ".storybook", - "drupal-attribute", -); -const { StorybookDrupalAttribute } = require(storybookAttributePath); +const { StorybookDrupalAttribute } = require("../../../../../.storybook/drupal-attribute"); const componentsPath = path.resolve(__dirname, "../../../components"); const compositionsPath = path.resolve(__dirname, "../../../compositions"); From fef56dbb544f2849597b6ef579f7958af599dc1e Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 12:02:39 +0200 Subject: [PATCH 03/15] OEL-4185: Fix spacing and improved see all fixed position. --- src/themes/default/src/scss/_mega-menu.scss | 41 ++++++++++----------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 5121ef915..17fef021a 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -189,16 +189,6 @@ ul.bcl-mega-menu__items { list-style: none; margin: 0; padding-inline-start: 0; - .__body { - @include media-breakpoint-up(lg) { - background: $primary-bg-subtle; - } - } - .__see_all { - @include media-breakpoint-up(lg) { - margin: 0 map-get($spacers, "3-5"); - } - } // Add a scrollbar in desktop viewport. .see-all-button { @include mm-item-padding(); @@ -215,16 +205,6 @@ ul.bcl-mega-menu__items { &:hover { background: $primary-bg-subtle; } - &:after { - background: $neutral-border-color; - content: ""; - block-size: 1px; - inset-inline-start: 0; - position: absolute; - inset-block-start: 0; - // Replicate horizontal padding of parent element. - inset-inline: $mm-gutter-x; - } > svg { flex-shrink: 0; } @@ -238,8 +218,25 @@ ul.bcl-mega-menu__items { @include media-breakpoint-up(lg) { block-size: $mm-panel-height; overflow-y: auto; - .__level-2 { - block-size: 240px; + .__body { + background: $primary-bg-subtle; + display: flex; + flex-direction: column; + flex-grow: 1; + > .__items { + flex-grow: 1; + block-size: 1px; + overflow: auto; + > .bcl-mega-menu__items.__level-2 { + block-size: auto; + > .__leaf { + margin: 0 map-get($spacers, "2-5"); + } + } + } + > .__see_all { + margin: 0 map-get($spacers, "4-25"); + } } } // Add space above in mobile viewport. From fb2487ec71a786c5158927cd93991088ffc76a93 Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 12:22:15 +0200 Subject: [PATCH 04/15] OEL-4185: Improved selectors. --- src/themes/default/src/scss/_mega-menu.scss | 46 ++++++++++++--------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 17fef021a..9c9647625 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -218,26 +218,6 @@ ul.bcl-mega-menu__items { @include media-breakpoint-up(lg) { block-size: $mm-panel-height; overflow-y: auto; - .__body { - background: $primary-bg-subtle; - display: flex; - flex-direction: column; - flex-grow: 1; - > .__items { - flex-grow: 1; - block-size: 1px; - overflow: auto; - > .bcl-mega-menu__items.__level-2 { - block-size: auto; - > .__leaf { - margin: 0 map-get($spacers, "2-5"); - } - } - } - > .__see_all { - margin: 0 map-get($spacers, "4-25"); - } - } } // Add space above in mobile viewport. @include media-breakpoint-down(lg) { @@ -404,6 +384,32 @@ ul.bcl-mega-menu__items { } } } + @include media-breakpoint-up(lg) { + > .__body { + background: $primary-bg-subtle; + display: flex; + flex-direction: column; + flex-grow: 1; + > .__items { + flex-grow: 1; + block-size: 1px; + overflow: auto; + > .bcl-mega-menu__items.__level-2 { + block-size: auto; + > .__leaf { + margin: 0 map-get($spacers, "4-25"); + > a { + padding-left: 0; + padding-right: 0; + } + } + } + } + > .__see_all { + margin: 0 map-get($spacers, "4-25"); + } + } + } } // Second level items column. From 13b4171774c840c35d70f2d32c7b1232033e6c9d Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 13:22:37 +0200 Subject: [PATCH 05/15] OEL-4185: Full clickable area. --- src/themes/default/src/scss/_mega-menu.scss | 22 +++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 9c9647625..08854a223 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -196,11 +196,9 @@ ul.bcl-mega-menu__items { display: flex; align-items: center; color: $link-color; - border-top: 1px solid $primary-bg-subtle; @include media-breakpoint-up(lg) { - border-top: 1px solid $primary-border-subtle; - padding-left: 0; - padding-right: 0; + padding: $mm-gutter-y map-get($spacers, "4-25"); + margin: 0 -1.75rem; } &:hover { background: $primary-bg-subtle; @@ -384,6 +382,15 @@ ul.bcl-mega-menu__items { } } } + > .__body { + > .__see_all { + border-top: 1px solid $primary-bg-subtle; + @include media-breakpoint-up(lg) { + border-top: 1px solid $primary-border-subtle; + margin: 0 map-get($spacers, "4-25"); + } + } + } @include media-breakpoint-up(lg) { > .__body { background: $primary-bg-subtle; @@ -397,17 +404,12 @@ ul.bcl-mega-menu__items { > .bcl-mega-menu__items.__level-2 { block-size: auto; > .__leaf { - margin: 0 map-get($spacers, "4-25"); > a { - padding-left: 0; - padding-right: 0; + padding: $mm-gutter-y map-get($spacers, "4-25"); } } } } - > .__see_all { - margin: 0 map-get($spacers, "4-25"); - } } } } From 2146f4038e8be50c001727ea722e2598c4d78b32 Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 13:23:22 +0200 Subject: [PATCH 06/15] OEL-4185: Prettier. --- src/themes/default/src/scss/_mega-menu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 08854a223..2184d4bd9 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -383,7 +383,7 @@ ul.bcl-mega-menu__items { } } > .__body { - > .__see_all { + > .__see_all { border-top: 1px solid $primary-bg-subtle; @include media-breakpoint-up(lg) { border-top: 1px solid $primary-border-subtle; From 7352004abc75f4423d2166c06ea4ffa2d9449f3f Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 14:03:40 +0200 Subject: [PATCH 07/15] OEL-4185: Fix span spacing. --- src/themes/default/src/scss/_mega-menu.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 2184d4bd9..0b292db61 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -403,8 +403,10 @@ ul.bcl-mega-menu__items { overflow: auto; > .bcl-mega-menu__items.__level-2 { block-size: auto; - > .__leaf { - > a { + > li { + > span, + > a, + > button { padding: $mm-gutter-y map-get($spacers, "4-25"); } } From 242e6d2e417d2ac262b2fbef02c82c87e941c4e8 Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 14:40:18 +0200 Subject: [PATCH 08/15] OEL-4185: Cleanup and markup improvements. --- .../__snapshots__/navbar.test.js.snap | 704 +++++++-------- .../__snapshots__/contact-form.test.js.snap | 630 +++++++------ .../__snapshots__/event.test.js.snap | 420 +++++---- .../__snapshots__/glossary.test.js.snap | 420 +++++---- .../__snapshots__/group.test.js.snap | 840 +++++++++--------- .../__snapshots__/header.test.js.snap | 630 +++++++------ .../__snapshots__/landing-page.test.js.snap | 210 +++-- .../__snapshots__/mega-menu.test.js.snap | 310 ++++--- .../bcl-mega-menu/mega-menu-submenu.html.twig | 12 +- .../bcl-news/__snapshots__/news.test.js.snap | 420 +++++---- .../bcl-page/__snapshots__/page.test.js.snap | 210 +++-- .../__snapshots__/person.test.js.snap | 420 +++++---- .../__snapshots__/procurement.test.js.snap | 630 +++++++------ .../__snapshots__/project.test.js.snap | 840 +++++++++--------- .../__snapshots__/publication.test.js.snap | 630 +++++++------ .../__snapshots__/subscription.test.js.snap | 210 +++-- .../bcl-user/__snapshots__/user.test.js.snap | 630 +++++++------ .../__snapshots__/vacancy.test.js.snap | 630 +++++++------ src/themes/default/src/scss/_mega-menu.scss | 52 +- 19 files changed, 4232 insertions(+), 4616 deletions(-) diff --git a/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap b/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap index d0d2ccda3..7345707aa 100644 --- a/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap +++ b/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap @@ -164,59 +164,55 @@ exports[`OE - navbar dark renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + +
    • + @@ -260,59 +256,55 @@ exports[`OE - navbar dark renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -610,59 +602,55 @@ exports[`OE - navbar light renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -706,59 +694,55 @@ exports[`OE - navbar light renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1039,59 +1023,55 @@ exports[`OE - navbar renders correctly with disable collapse 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1135,59 +1115,55 @@ exports[`OE - navbar renders correctly with disable collapse 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1484,59 +1460,55 @@ exports[`OE - navbar renders correctly with expand small 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1580,59 +1552,55 @@ exports[`OE - navbar renders correctly with expand small 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    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 504f4c651..a42655adf 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 @@ -181,51 +181,47 @@ exports[`OE - Contact-form contact-form error page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Contact-form contact-form error page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1712,51 +1704,47 @@ exports[`OE - Contact-form contact-form page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1818,86 +1806,82 @@ exports[`OE - Contact-form contact-form page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -3211,51 +3195,47 @@ exports[`OE - Contact-form contact-form success page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -3317,86 +3297,82 @@ exports[`OE - Contact-form contact-form success page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-event/__snapshots__/event.test.js.snap b/src/compositions/bcl-event/__snapshots__/event.test.js.snap index 408273302..c49eaa478 100644 --- a/src/compositions/bcl-event/__snapshots__/event.test.js.snap +++ b/src/compositions/bcl-event/__snapshots__/event.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - event listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - event listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2549,51 +2541,47 @@ exports[`OE - event page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2655,86 +2643,82 @@ exports[`OE - event page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap b/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap index 56aa3fb81..567ea116a 100644 --- a/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap +++ b/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Glossary detail renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Glossary detail renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1928,51 +1920,47 @@ exports[`OE - Glossary listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2034,86 +2022,82 @@ exports[`OE - Glossary listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-group/__snapshots__/group.test.js.snap b/src/compositions/bcl-group/__snapshots__/group.test.js.snap index e4192f34b..a2ef75d20 100644 --- a/src/compositions/bcl-group/__snapshots__/group.test.js.snap +++ b/src/compositions/bcl-group/__snapshots__/group.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Group landing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Group landing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2383,51 +2375,47 @@ exports[`OE - Group listing Content renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2489,86 +2477,82 @@ exports[`OE - Group listing Content renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4550,51 +4534,47 @@ exports[`OE - Group listing Member renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4656,86 +4636,82 @@ exports[`OE - Group listing Member renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -6564,51 +6540,47 @@ exports[`OE - Group listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -6670,86 +6642,82 @@ exports[`OE - Group listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-header/__snapshots__/header.test.js.snap b/src/compositions/bcl-header/__snapshots__/header.test.js.snap index 6af035e61..367424cbc 100644 --- a/src/compositions/bcl-header/__snapshots__/header.test.js.snap +++ b/src/compositions/bcl-header/__snapshots__/header.test.js.snap @@ -175,51 +175,47 @@ exports[`OE - Header EC renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -281,86 +277,82 @@ exports[`OE - Header EC renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1176,51 +1168,47 @@ exports[`OE - Header EU renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1282,86 +1270,82 @@ exports[`OE - Header EU renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2171,51 +2155,47 @@ exports[`OE - Header Neutral renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2277,86 +2257,82 @@ exports[`OE - Header Neutral renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    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 4b8a5e8fe..474f6a030 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 @@ -181,51 +181,47 @@ exports[`OE - Landing page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Landing page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-mega-menu/__snapshots__/mega-menu.test.js.snap b/src/compositions/bcl-mega-menu/__snapshots__/mega-menu.test.js.snap index 58b63667b..81be75993 100644 --- a/src/compositions/bcl-mega-menu/__snapshots__/mega-menu.test.js.snap +++ b/src/compositions/bcl-mega-menu/__snapshots__/mega-menu.test.js.snap @@ -125,41 +125,37 @@ exports[`OE - Mega Menu renders correctly 1`] = `
    -
    - -
    + Sub-submenu item 1.3 + + +
    @@ -223,131 +219,127 @@ exports[`OE - Mega Menu renders correctly 1`] = `
    -
    - -
    + Sub-submenu item 2.14 + + +
    @@ -418,30 +410,26 @@ exports[`OE - Mega Menu renders correctly 1`] = `
    -
    - -
    + Sub-submenu item 5.2 + + +
    diff --git a/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig b/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig index 1010239bc..defbd2a7f 100644 --- a/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig +++ b/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig @@ -54,13 +54,11 @@
    {% endif %}
    -
    - {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with { - items: _items, - icon_path: _icon_path, - level: _level, - } only %} -
    + {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with { + items: _items, + icon_path: _icon_path, + level: _level, + } only %} {% if _see_all_link %}
    {% include '@oe-bcl/bcl-link/link.html.twig' with _see_all_link only %} diff --git a/src/compositions/bcl-news/__snapshots__/news.test.js.snap b/src/compositions/bcl-news/__snapshots__/news.test.js.snap index d748e298e..dafd6e4e5 100644 --- a/src/compositions/bcl-news/__snapshots__/news.test.js.snap +++ b/src/compositions/bcl-news/__snapshots__/news.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - News full page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - News full page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1630,51 +1622,47 @@ exports[`OE - News listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1736,86 +1724,82 @@ exports[`OE - News listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-page/__snapshots__/page.test.js.snap b/src/compositions/bcl-page/__snapshots__/page.test.js.snap index 28ac7b175..0402631a4 100644 --- a/src/compositions/bcl-page/__snapshots__/page.test.js.snap +++ b/src/compositions/bcl-page/__snapshots__/page.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Page Page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Page Page renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-person/__snapshots__/person.test.js.snap b/src/compositions/bcl-person/__snapshots__/person.test.js.snap index fc623274b..7b6961e49 100644 --- a/src/compositions/bcl-person/__snapshots__/person.test.js.snap +++ b/src/compositions/bcl-person/__snapshots__/person.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Person details renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Person details renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1761,51 +1753,47 @@ exports[`OE - Person listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1867,86 +1855,82 @@ exports[`OE - Person listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap b/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap index d69622410..9323f984d 100644 --- a/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap +++ b/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Procurement details (closed) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Procurement details (closed) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2173,51 +2165,47 @@ exports[`OE - Procurement details (opened) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2279,86 +2267,82 @@ exports[`OE - Procurement details (opened) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4164,51 +4148,47 @@ exports[`OE - Procurement listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4270,86 +4250,82 @@ exports[`OE - Procurement listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-project/__snapshots__/project.test.js.snap b/src/compositions/bcl-project/__snapshots__/project.test.js.snap index 3ba85e87a..6f93af43c 100644 --- a/src/compositions/bcl-project/__snapshots__/project.test.js.snap +++ b/src/compositions/bcl-project/__snapshots__/project.test.js.snap @@ -1988,51 +1988,47 @@ exports[`OE - Project listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2094,86 +2090,82 @@ exports[`OE - Project listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4071,51 +4063,47 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4177,86 +4165,82 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -7412,51 +7396,47 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -7518,86 +7498,82 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -10753,51 +10729,47 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -10859,86 +10831,82 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-publication/__snapshots__/publication.test.js.snap b/src/compositions/bcl-publication/__snapshots__/publication.test.js.snap index 1bccd5cb4..330858aea 100644 --- a/src/compositions/bcl-publication/__snapshots__/publication.test.js.snap +++ b/src/compositions/bcl-publication/__snapshots__/publication.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Publication details (multiple authors) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Publication details (multiple authors) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -1985,51 +1977,47 @@ exports[`OE - Publication details renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2091,86 +2079,82 @@ exports[`OE - Publication details renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -3798,51 +3782,47 @@ exports[`OE - Publication listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -3904,86 +3884,82 @@ exports[`OE - Publication listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-subscription/__snapshots__/subscription.test.js.snap b/src/compositions/bcl-subscription/__snapshots__/subscription.test.js.snap index 479090a4b..a6b691964 100644 --- a/src/compositions/bcl-subscription/__snapshots__/subscription.test.js.snap +++ b/src/compositions/bcl-subscription/__snapshots__/subscription.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Subscription renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Subscription renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-user/__snapshots__/user.test.js.snap b/src/compositions/bcl-user/__snapshots__/user.test.js.snap index de18df1bb..2b8a9e1d7 100644 --- a/src/compositions/bcl-user/__snapshots__/user.test.js.snap +++ b/src/compositions/bcl-user/__snapshots__/user.test.js.snap @@ -223,51 +223,47 @@ exports[`OE - User list renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -329,86 +325,82 @@ exports[`OE - User list renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2107,51 +2099,47 @@ exports[`OE - User renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2213,86 +2201,82 @@ exports[`OE - User renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4555,51 +4539,47 @@ exports[`OE - User terms renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4661,86 +4641,82 @@ exports[`OE - User terms renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/compositions/bcl-vacancy/__snapshots__/vacancy.test.js.snap b/src/compositions/bcl-vacancy/__snapshots__/vacancy.test.js.snap index 765759daf..2439eb75a 100644 --- a/src/compositions/bcl-vacancy/__snapshots__/vacancy.test.js.snap +++ b/src/compositions/bcl-vacancy/__snapshots__/vacancy.test.js.snap @@ -181,51 +181,47 @@ exports[`OE - Vacancy details (closed) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -287,86 +283,82 @@ exports[`OE - Vacancy details (closed) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2478,51 +2470,47 @@ exports[`OE - Vacancy details (opened) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -2584,86 +2572,82 @@ exports[`OE - Vacancy details (opened) renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4774,51 +4758,47 @@ exports[`OE - Vacancy listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    @@ -4880,86 +4860,82 @@ exports[`OE - Vacancy listing renders correctly 1`] = `
    -
    - -
    + Base Sub Category Item + + +
    diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 0b292db61..9dfaf7611 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -397,18 +397,13 @@ ul.bcl-mega-menu__items { display: flex; flex-direction: column; flex-grow: 1; - > .__items { + > .bcl-mega-menu__items { flex-grow: 1; block-size: 1px; - overflow: auto; - > .bcl-mega-menu__items.__level-2 { - block-size: auto; - > li { - > span, - > a, - > button { - padding: $mm-gutter-y map-get($spacers, "4-25"); - } + overflow-y: auto; + &.__level-2 { + > li > :is(span, a, button) { + @include mm-item-padding($px: map-get($spacers, "4-25")); } } } @@ -416,43 +411,6 @@ ul.bcl-mega-menu__items { } } -// Second level items column. -.bcl-mega-menu__second-submenu { - > .tab-content > .tab-pane { - // In desktop, the entire second-level list has a light blue background. - @include media-breakpoint-up(lg) { - background: $primary-bg-subtle; - } - // Hide other parts of the mega menu in mobile, when a sub-submenu is open. - @include media-breakpoint-down(lg) { - .bcl-mega-menu__container:has(&.active) { - .bcl-mega-menu__info, - .bcl-mega-menu__first-submenu { - display: none; - } - } - } - // The panel title only shows in mobile. - > .panel-title { - @include mm-item-padding(map-get($spacers, 3)); - margin: 0; - color: $dark; - background: $primary-bg-subtle; - display: block; - font-size: 20px; - @include media-breakpoint-up(lg) { - display: none; - } - } - // Items get a bit more space to the sides in xl viewport. - @include media-breakpoint-up(xl) { - > ul > li > * { - margin: 0 map-get($spacers, "2-5"); - } - } - } -} - // Set light-blue full-width background on some elements. @include media-breakpoint-down(lg) { .bcl-mega-menu__submenu > .__header, From 6ad2e10d9c597d7393c129269e6b4c185757fb9b Mon Sep 17 00:00:00 2001 From: Tiberiu Dumitru Date: Tue, 18 Nov 2025 19:03:20 +0200 Subject: [PATCH 09/15] OEL-4185: Darker border color. --- src/themes/default/src/scss/_mega-menu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 9dfaf7611..2307cd46c 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -384,7 +384,7 @@ ul.bcl-mega-menu__items { } > .__body { > .__see_all { - border-top: 1px solid $primary-bg-subtle; + border-top: 1px solid $neutral-border-color; @include media-breakpoint-up(lg) { border-top: 1px solid $primary-border-subtle; margin: 0 map-get($spacers, "4-25"); From 257bbc99925fe3a660b9ed9b3daa769fa6991a71 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 18 Nov 2025 22:17:17 +0100 Subject: [PATCH 10/15] OEL-4185: Move the .__see-all style down. --- src/themes/default/src/scss/_mega-menu.scss | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 2307cd46c..ff65b8ffc 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -382,15 +382,6 @@ ul.bcl-mega-menu__items { } } } - > .__body { - > .__see_all { - border-top: 1px solid $neutral-border-color; - @include media-breakpoint-up(lg) { - border-top: 1px solid $primary-border-subtle; - margin: 0 map-get($spacers, "4-25"); - } - } - } @include media-breakpoint-up(lg) { > .__body { background: $primary-bg-subtle; @@ -409,6 +400,13 @@ ul.bcl-mega-menu__items { } } } + > .__body > .__see_all { + border-top: 1px solid $neutral-border-color; + @include media-breakpoint-up(lg) { + border-top: 1px solid $primary-border-subtle; + margin: 0 map-get($spacers, "4-25"); + } + } } // Set light-blue full-width background on some elements. From 8be6bd44074fa3c6ba245944d1f436a2300917d8 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 18 Nov 2025 22:18:21 +0100 Subject: [PATCH 11/15] OEL-4185: Move the .see-all-button style into .__see-all section. --- src/themes/default/src/scss/_mega-menu.scss | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index ff65b8ffc..ec167c3b9 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -190,29 +190,6 @@ ul.bcl-mega-menu__items { margin: 0; padding-inline-start: 0; // Add a scrollbar in desktop viewport. - .see-all-button { - @include mm-item-padding(); - // Use flex for icon spacing. - display: flex; - align-items: center; - color: $link-color; - @include media-breakpoint-up(lg) { - padding: $mm-gutter-y map-get($spacers, "4-25"); - margin: 0 -1.75rem; - } - &:hover { - background: $primary-bg-subtle; - } - > svg { - flex-shrink: 0; - } - > span { - text-overflow: ellipsis; - overflow: hidden; - display: block; - white-space: nowrap; - } - } @include media-breakpoint-up(lg) { block-size: $mm-panel-height; overflow-y: auto; @@ -406,6 +383,29 @@ ul.bcl-mega-menu__items { border-top: 1px solid $primary-border-subtle; margin: 0 map-get($spacers, "4-25"); } + > .see-all-button { + @include mm-item-padding(); + // Use flex for icon spacing. + display: flex; + align-items: center; + color: $link-color; + @include media-breakpoint-up(lg) { + padding: $mm-gutter-y map-get($spacers, "4-25"); + margin: 0 -1.75rem; + } + &:hover { + background: $primary-bg-subtle; + } + > svg { + flex-shrink: 0; + } + > span { + text-overflow: ellipsis; + overflow: hidden; + display: block; + white-space: nowrap; + } + } } } From 226b2e6f7fdf330d5d0e31f4032b1d8e7e2b6edc Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 18 Nov 2025 22:35:51 +0100 Subject: [PATCH 12/15] OEL-4185: Remove redundant background color on .__body. --- src/themes/default/src/scss/_mega-menu.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index ec167c3b9..29a272b2f 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -361,7 +361,6 @@ ul.bcl-mega-menu__items { } @include media-breakpoint-up(lg) { > .__body { - background: $primary-bg-subtle; display: flex; flex-direction: column; flex-grow: 1; From af83632eb7eb460912047b039917265bfeb19117 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 18 Nov 2025 22:51:53 +0100 Subject: [PATCH 13/15] OEL-4185: Rely on flex-basis, instead of block-size: 1px. --- src/themes/default/src/scss/_mega-menu.scss | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 29a272b2f..37f2cb447 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -363,15 +363,12 @@ ul.bcl-mega-menu__items { > .__body { display: flex; flex-direction: column; - flex-grow: 1; + flex: 1 1 0; > .bcl-mega-menu__items { - flex-grow: 1; - block-size: 1px; + flex: 1 1 0; overflow-y: auto; - &.__level-2 { - > li > :is(span, a, button) { - @include mm-item-padding($px: map-get($spacers, "4-25")); - } + > li > :is(span, a, button) { + @include mm-item-padding($px: map-get($spacers, "4-25")); } } } From 8624360ce16f8decb9f818b36d75ad2ae7caec5a Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 18 Nov 2025 23:08:43 +0100 Subject: [PATCH 14/15] OEL-4185: Drop the .__body wrapper. --- .../bcl-mega-menu/mega-menu-submenu.html.twig | 22 +++++++++---------- src/themes/default/src/scss/_mega-menu.scss | 15 +++++-------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig b/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig index defbd2a7f..729561a95 100644 --- a/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig +++ b/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig @@ -53,18 +53,16 @@

    {{ _trigger.label }}

    {% endif %} -
    - {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with { - items: _items, - 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 %} -
    + {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with { + items: _items, + 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/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index 37f2cb447..85e8356cf 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -360,20 +360,15 @@ ul.bcl-mega-menu__items { } } @include media-breakpoint-up(lg) { - > .__body { - display: flex; - flex-direction: column; + > .bcl-mega-menu__items { flex: 1 1 0; - > .bcl-mega-menu__items { - flex: 1 1 0; - overflow-y: auto; - > li > :is(span, a, button) { - @include mm-item-padding($px: map-get($spacers, "4-25")); - } + overflow-y: auto; + > li > :is(span, a, button) { + @include mm-item-padding($px: map-get($spacers, "4-25")); } } } - > .__body > .__see_all { + > .__see_all { border-top: 1px solid $neutral-border-color; @include media-breakpoint-up(lg) { border-top: 1px solid $primary-border-subtle; From 4246ded5642e0c61321e06038b2b5ccef6c2e126 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 18 Nov 2025 23:09:03 +0100 Subject: [PATCH 15/15] OEL-4185: Update snaps, dropping the .__body wrapper. --- .../__snapshots__/navbar.test.js.snap | 704 ++++++------- .../__snapshots__/contact-form.test.js.snap | 720 +++++++------ .../__snapshots__/event.test.js.snap | 480 +++++---- .../__snapshots__/glossary.test.js.snap | 480 +++++---- .../__snapshots__/group.test.js.snap | 960 +++++++++--------- .../__snapshots__/header.test.js.snap | 720 +++++++------ .../__snapshots__/landing-page.test.js.snap | 240 +++-- .../__snapshots__/mega-menu.test.js.snap | 370 ++++--- .../bcl-news/__snapshots__/news.test.js.snap | 480 +++++---- .../bcl-page/__snapshots__/page.test.js.snap | 240 +++-- .../__snapshots__/person.test.js.snap | 480 +++++---- .../__snapshots__/procurement.test.js.snap | 720 +++++++------ .../__snapshots__/project.test.js.snap | 960 +++++++++--------- .../__snapshots__/publication.test.js.snap | 720 +++++++------ .../__snapshots__/subscription.test.js.snap | 240 +++-- .../bcl-user/__snapshots__/user.test.js.snap | 720 +++++++------ .../__snapshots__/vacancy.test.js.snap | 720 +++++++------ 17 files changed, 4807 insertions(+), 5147 deletions(-) diff --git a/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap b/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap index 7345707aa..b57fddd8f 100644 --- a/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap +++ b/src/components/bcl-navbar/__snapshots__/navbar.test.js.snap @@ -161,59 +161,55 @@ exports[`OE - navbar dark renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Contact-form contact-form error page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -1803,86 +1791,82 @@ exports[`OE - Contact-form contact-form page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -3294,86 +3274,82 @@ exports[`OE - Contact-form contact-form success page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - event listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -2640,86 +2628,82 @@ exports[`OE - event page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Glossary detail renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -2019,86 +2007,82 @@ exports[`OE - Glossary listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
    • -
    - -
    + +
  • - - See all - - - - + Base Sub Category Item -
    • + + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Group landing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2474,86 +2462,82 @@ exports[`OE - Group listing Content renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -4633,86 +4613,82 @@ exports[`OE - Group listing Member renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -6639,86 +6611,82 @@ exports[`OE - Group listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -274,86 +270,82 @@ exports[`OE - Header EC renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -1267,86 +1255,82 @@ exports[`OE - Header EU renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2254,86 +2234,82 @@ exports[`OE - Header Neutral renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Landing page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - More of submenu item 1, where even the see all text is very long. - - - - + Sub-submenu item 1.3 - +
    • + +
    + + + More of submenu item 1, where even the see all text is very long. + + + + +
    @@ -216,150 +212,146 @@ exports[`OE - Mega Menu renders correctly 1`] = ` Submenu item 3 (many children)

    -
    - -
    + +
  • - - More of submenu item 3 - - - - + Sub-submenu item 2.14 -
    • + + +
    + + + More of submenu item 3 + + + + +
    @@ -407,30 +399,26 @@ exports[`OE - Mega Menu renders correctly 1`] = ` Submenu item 5 (nolink parent)

    -
    - -
    + Sub-submenu item 5.2 + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - News full page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -1721,86 +1709,82 @@ exports[`OE - News listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Page Page renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Person details renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -1852,86 +1840,82 @@ exports[`OE - Person listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Procurement details (closed) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2264,86 +2252,82 @@ exports[`OE - Procurement details (opened) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -4247,86 +4227,82 @@ exports[`OE - Procurement listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2087,86 +2083,82 @@ exports[`OE - Project listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -4162,86 +4150,82 @@ exports[`OE - Project page (closed) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -7495,86 +7475,82 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -10828,86 +10800,82 @@ exports[`OE - Project page (planned) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Publication details (multiple authors) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2076,86 +2064,82 @@ exports[`OE - Publication details renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -3881,86 +3861,82 @@ exports[`OE - Publication listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Subscription renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -322,86 +318,82 @@ exports[`OE - User list renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2198,86 +2186,82 @@ exports[`OE - User renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -4638,86 +4618,82 @@ exports[`OE - User terms renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -280,86 +276,82 @@ exports[`OE - Vacancy details (closed) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -2569,86 +2557,82 @@ exports[`OE - Vacancy details (opened) renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +
  • -
    - -
    +
    • +
  • - - See all - - - - + Base Sub Category Item - +
    • + +
    + + + See all + + + + +
    @@ -4857,86 +4837,82 @@ exports[`OE - Vacancy listing renders correctly 1`] = ` Base Category Item

    -
    - -
    + Base Sub Category Item + + +