@openeuropa/bcl-theme-joinup 1.10.8 → 1.10.9

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openeuropa/bcl-theme-joinup",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "1.10.8",
+  "version": "1.10.9",
   "description": "OE - BCL theme joinup",
   "scripts": {
     "align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
@@ -28,15 +28,15 @@
     "@ecl/resources-eu-logo": "3.7.1",
     "@ecl/resources-flag-icons": "3.7.1",
     "@fontsource/roboto": "5.2.8",
-    "@openeuropa/bcl-bootstrap": "^1.10.8",
-    "@openeuropa/bcl-builder": "^1.10.8",
-    "@openeuropa/bcl-theme-default": "^1.10.8",
-    "@openeuropa/bcl-twig-templates": "^1.10.8",
+    "@openeuropa/bcl-bootstrap": "^1.10.9",
+    "@openeuropa/bcl-builder": "^1.10.9",
+    "@openeuropa/bcl-theme-default": "^1.10.9",
+    "@openeuropa/bcl-twig-templates": "^1.10.9",
     "@rollup/plugin-replace": "6.0.2",
     "copyfiles": "2.4.1",
     "cross-env": "10.1.0",
     "flag-icons": "6.9.2",
-    "glob": "11.0.3",
+    "glob": "11.1.0",
     "npm-run-all": "4.1.5",
     "slim-select": "1.27.1"
   },
@@ -57,5 +57,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "9c2e64443ae179948cbf748c41d438af7a0f2421"
+  "gitHead": "cb9864341bfc98404071520d61568bd18e17e1fe"
 }

package/src/js/index.esm.js

@@ -23,6 +23,7 @@ import ScrollSpy from "@openeuropa/bcl-bootstrap/js/src/scrollspy-legacy";
 import Tab from "@openeuropa/bcl-bootstrap/js/src/tab";
 import Toast from "@openeuropa/bcl-bootstrap/js/src/toast";
 import Tooltip from "@openeuropa/bcl-bootstrap/js/src/tooltip";
+import Header from "@openeuropa/bcl-theme-default/src/js/header/header";
 
 export {
   Alert,
@@ -43,4 +44,5 @@ export {
   Tab,
   Toast,
   Tooltip,
+  Header,
 };

package/src/js/index.umd.js

@@ -23,6 +23,7 @@ import ScrollSpy from "@openeuropa/bcl-bootstrap/js/src/scrollspy-legacy";
 import Tab from "@openeuropa/bcl-bootstrap/js/src/tab";
 import Toast from "@openeuropa/bcl-bootstrap/js/src/toast";
 import Tooltip from "@openeuropa/bcl-bootstrap/js/src/tooltip";
+import Header from "@openeuropa/bcl-theme-default/src/js/header/header";
 
 export default {
   Alert,
@@ -43,4 +44,5 @@ export default {
   Tab,
   Toast,
   Tooltip,
+  Header,
 };

package/templates/bcl-file/file.html.twig

@@ -139,7 +139,7 @@
           {% endif %}
         </div>
         {% set download_attributes = create_attribute()
-                                      .setAttribute('download', 'true')
+                                      .setAttribute('download', true)
                                       .setAttribute('target', '_blank')
                                       .addClass(['standalone', 'align-self-center', 'd-inline-block', 'mt-1', 'mt-md-0', 'flex-shrink-0']) %}
         {% set _download = _download|merge({

package/templates/bcl-header/header.html.twig

@@ -17,6 +17,8 @@
   - language_modal (object) (default: {})
   - light (boolean) (default: false)
   - modals (modal[]) (default: [])
+  - toggler_attributes (drupal attrs)
+  - icon_path (string) (default: '')
   - attributes (drupal attrs)
 #}
 
@@ -30,6 +32,8 @@
 {% set _breadcrumbs = breadcrumbs|default({}) %}
 {% set _language_modal = language_modal|default({}) %}
 {% set _light = light ?? false %}
+{% set _toggler_attributes = toggler_attributes ?: create_attribute() %}
+{% set _icon_path = icon_path|default('') %}
 {% set _modals = modals|default([]) %}
 
 {% set _site_name_classes = 'bcl-header__site-name' %}
@@ -38,7 +42,7 @@
   {% set attributes = create_attribute() %}
 {% endif %}
 
-{% set attributes = attributes.addClass(['bcl-header', 'bcl-header--' ~ _variant]) %}
+{% set attributes = attributes.addClass(['bcl-header', 'bcl-header--' ~ _variant, 'shadow-sm']) %}
 
 {% if site_name_classes is not empty %}
   {% set _site_name_classes = _site_name_classes ~ ' ' ~ site_name_classes %}
@@ -49,6 +53,33 @@
   {% set _project_classes = _project_classes ~ ' light' %}
 {% endif %}
 
+{% set toggler_attributes = _toggler_attributes.addClass(['bcl-navbar-toggler', 'd-lg-none'])
+  .setAttribute('type', 'button')
+  .setAttribute('data-bs-toggle', 'collapse')
+  .setAttribute('data-bs-target', '#' ~ navbar_id)
+  .setAttribute('aria-controls', navbar_id)
+  .setAttribute('aria-expanded', 'false')
+%}
+
+{% set navbar_toggle_button %}
+  <button
+    {{ toggler_attributes }}
+  >
+    {% include '@oe-bcl/bcl-icon/icon.html.twig' with {
+      name: 'list',
+      size: 'fluid',
+      path: _icon_path,
+      attributes: create_attribute().addClass(['default-icon']),
+    } only %}
+    {% include '@oe-bcl/bcl-icon/icon.html.twig' with {
+      name: 'x',
+      size: 'fluid',
+      path: _icon_path,
+      attributes: create_attribute().addClass(['active-icon']),
+    } only %}
+  </button>
+{% endset %}
+
 <header
   {{ attributes }}
 >
@@ -70,54 +101,16 @@
       {% endfor %}
       </a>
     {% endif %}
-      <button
-        class="navbar-toggler bcl-navbar-toggler"
-        type="button"
-        data-bs-toggle="collapse"
-        data-bs-target='#{{ _navbar_id }}'
-        aria-controls='{{ _navbar_id }}'
-        aria-expanded="false"
-        aria-label="Toggle navigation"
-      >
-        <span class="navbar-toggler-icon"></span>
-      </button>
+      {{ navbar_toggle_button }}
     </div>
   </nav>
 
-
-  <!-- project name -->
-  {% if _project_logo is not empty or _site_name is not empty %}
-  <div class="{{ _project_classes  }}">
+  <!-- site name -->
+  <div class="bcl-header__site-name" id="site-name-heading">
     <div class="container">
-    {% if _project_link is not empty %}
-      <a
-        href="{{ _project_link }}"
-      >
-    {% endif %}
-      {% if _project_logo is not empty %}
-        <img
-        {% if _project_logo.path is not empty %}
-          src="{{ _project_logo.path }}"
-        {% endif %}
-        {% if _project_logo.alt is not empty %}
-          alt="{{ _project_logo.alt }}"
-        {% endif %}
-        {% if _project_logo.classes is not empty %}
-          class="{{ _project_logo.classes }}"
-        {% endif %}
-        />
-      {% endif %}
-      {% if _site_name is not empty %}
-        <span class="{{ _site_name_classes }}">
-        {{- _site_name -}}
-        </span>
-      {% endif %}
-    {% if _project_link is not empty %}
-      </a>
-    {% endif %}
+      <span class="h5 py-3-5 border-top-subtle mb-0 d-block">{{ _site_name }}</span>
     </div>
   </div>
-  {% endif %}
 
   <!-- navbar -->
   {% if _navbar is not empty %}
@@ -126,15 +119,15 @@
       attributes: create_attribute().addClass('bcl-header__navbar collapse navbar-collapse').setAttribute('id', _navbar_id).setAttribute('aria-label', 'Main Navigation'),
     }) only %}
   {% endif %}
-
-  <!-- breadcrumbs -->
-  {% if _breadcrumbs is not empty %}
-    <div class="container">
-      {% include '@oe-bcl/bcl-breadcrumb/breadcrumb.html.twig' with _breadcrumbs only %}
-    </div>
-  {% endif %}
 </header>
 
+<!-- breadcrumbs -->
+{% if _breadcrumbs is not empty %}
+  <div class="container">
+    {% include '@oe-bcl/bcl-breadcrumb/breadcrumb.html.twig' with _breadcrumbs only %}
+  </div>
+{% endif %}
+
 {% for modal in _modals %}
   {% include '@oe-bcl/bcl-modal/modal.html.twig' with modal only %}
 {% endfor %}

package/templates/bcl-links-block/links-block.html.twig

@@ -56,7 +56,7 @@
         {% endif %}
         {% set _link = _link|merge({
           clean_class: true,
-          attributes: _link.attributes.addClass(['pb-3', 'd-inline-block', 'standalone'])
+          attributes: _link.attributes.addClass(['mb-3', 'd-inline-block', 'standalone'])
         }) %}
         {% set _list_item_classes = 'list-unstyled' %}
         {% if _variant == 'horizontal' %}

package/templates/bcl-mega-menu/mega-menu-submenu.html.twig

@@ -21,30 +21,28 @@
 }) %}
 {% include '@oe-bcl/bcl-button/button.html.twig' with _trigger only %}
 
-{# Add an optional "See all" link as last item. #}
+{% set _see_all_link = null %}
+{# Prepare an optional "See all" link rendered outside the list. #}
 {% if _see_all is not empty %}
-  {# Wrap the label for an ellipsis. #}
   {% set _see_all_label %}
     <span>{{- _see_all.label -}}</span>
   {% 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)
-  .setAttribute('hidden', '')
+  .setAttribute('hidden', true)
   .setAttribute('role', 'group')
   .setAttribute('aria-labelledby', _trigger_id)
   .addClass('bcl-mega-menu__submenu', '__level-' ~ _level)
@@ -60,6 +58,11 @@
     icon_path: _icon_path,
     level: _level,
   } only %}
+  {% if _see_all_link %}
+    <div class="__see_all">
+      {% include '@oe-bcl/bcl-link/link.html.twig' with _see_all_link only %}
+    </div>
+  {% endif %}
 </div>
 
 {% endapply %}

package/templates/bcl-modal/modal.html.twig

@@ -7,7 +7,8 @@
   - fullscreen_responsive (string) (default: '')
     options: sm, md, lg, xl, xxl
   - static_backdrop (boolean) (default: false)
-  - verticaly_centered (boolean) (default: false)
+  - vertically_centered (boolean) (default: false)
+  - verticaly_centered (boolean) (default: false) // deprecated typo
   - scrollable (boolean) (default: false)
   - header (block) (default: '')
   - messages (block) (default: '')
@@ -29,7 +30,7 @@
 {% set _id = id|default('modal-' ~ random(10000)) %}
 {% set _fullscreen_responsive =  fullscreen_responsive|default('') %}
 {% set _static_backdrop = static_backdrop ?? false %}
-{% set _verticaly_centered = verticaly_centered ?? false %}
+{% set _vertically_centered = vertically_centered ?? verticaly_centered ?? false %}
 {% set _scrollable = scrollable ?? false %}
 {% set _header = header|default('') %}
 {% set _header_attributes = header_attributes ?: create_attribute() %}
@@ -63,7 +64,7 @@
   <div class="modal-dialog
   {{- _size ? ' modal-' ~ size -}}
   {{- _fullscreen_responsive ? ' modal-fullscreen-' ~ _fullscreen_responsive ~ '-down' -}}
-  {{- _verticaly_centered ? ' modal-dialog-centered' -}}
+  {{- _vertically_centered ? ' modal-dialog-centered' -}}
   {{- _scrollable ? ' modal-dialog-scrollable' -}}"
   >
     <div class="modal-content">