@openeuropa/bcl-theme-joinup 0.24.0 → 0.25.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openeuropa/bcl-theme-joinup",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "OE - BCL theme joinup",
   "scripts": {
     "align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
@@ -20,18 +20,18 @@
     "update:templates": "run-s align-templates build:copy"
   },
   "devDependencies": {
-    "@babel/core": "7.18.5",
-    "@babel/plugin-transform-runtime": "7.18.5",
-    "@babel/preset-env": "7.18.2",
-    "@babel/preset-react": "7.17.12",
-    "@ecl/resources-ec-logo": "3.3.2",
-    "@ecl/resources-eu-logo": "3.3.2",
-    "@ecl/resources-flag-icons": "3.3.2",
+    "@babel/core": "7.18.6",
+    "@babel/plugin-transform-runtime": "7.18.6",
+    "@babel/preset-env": "7.18.6",
+    "@babel/preset-react": "7.18.6",
+    "@ecl/resources-ec-logo": "3.3.3",
+    "@ecl/resources-eu-logo": "3.3.3",
+    "@ecl/resources-flag-icons": "3.3.3",
     "@fontsource/roboto": "4.5.7",
-    "@openeuropa/bcl-bootstrap": "^0.24.0",
-    "@openeuropa/bcl-builder": "^0.24.0",
-    "@openeuropa/bcl-theme-default": "^0.24.0",
-    "@openeuropa/bcl-twig-templates": "^0.24.0",
+    "@openeuropa/bcl-bootstrap": "^0.25.0",
+    "@openeuropa/bcl-builder": "^0.25.0",
+    "@openeuropa/bcl-theme-default": "^0.25.0",
+    "@openeuropa/bcl-twig-templates": "^0.25.0",
     "copyfiles": "2.4.1",
     "cross-env": "7.0.3",
     "glob": "8.0.3",
@@ -56,5 +56,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "a46bb6bc12771da4667516dc7b0665b00504ade2"
+  "gitHead": "f50c7dfeab8695bbb5c18d5f7d5304509512268a"
 }

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

@@ -2,6 +2,10 @@
 
 {#
   Parameters:
+  - title (string) (default: '')
+  - title_tag (string) (default: 'h2')
+  - title_link: (link object) (default: {})
+  - title_attributes: (drupal attrs)
   - id (int) (default: random(1000))
   - flush (boolean) (default: false)
   - items (array) (default: []): format: [
@@ -16,6 +20,10 @@
   - attributes (drupal attrs)
 #}
 
+{% set _title = title|default('') %}
+{% set _title_tag = title_tag|default('h2') %}
+{% set _title_link = title_link|default({}) %}
+{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _id = id|default(random(1000)) %}
 {% set _flush = flush|default(false) %}
 {% set _items = items|default([]) %}
@@ -35,6 +43,15 @@
 <div
   {{ attributes }}
 >
+{%- if _title is not empty -%}
+  {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+    title: _title,
+    title_tag: _title_tag,
+    title_link: _title_link,
+    attributes: _title_attributes,
+  } only %}
+{%- endif -%}
+
 {% for _item in _items %}
   {% set _open_item = _open_item_id == loop.index %}
   {% set _button_classes = ['accordion-button'] %}

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

@@ -1,6 +1,10 @@
 {% spaceless %}
 
 {# Parameters:
+  - title (string) (default: '')
+  - title_tag (string) (default: 'h2')
+  - title_link: (link object) (default: {})
+  - title_attributes: (drupal attrs)
   - quote (string) (default: '')
   - attribution (string) (default: '')
   - cite (string) (default: '')
@@ -9,6 +13,10 @@
   - attributes (drupal attrs)
 #}
 
+{% set _title = title|default('') %}
+{% set _title_tag = title_tag|default('h2') %}
+{% set _title_link = title_link|default({}) %}
+{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _quote = quote|default('') %}
 {% set _attribution = attribution|default('') %}
 {% set _cite = cite|default('') %}
@@ -37,6 +45,15 @@
 
 {% set attributes = attributes.addClass(_classes) %}
 
+{%- if _title is not empty -%}
+  {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+    title: _title,
+    title_tag: _title_tag,
+    title_link: _title_link,
+    attributes: _title_attributes,
+  } only %}
+{%- endif -%}
+
 <figure
   {{ attributes }}
 >

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

@@ -28,9 +28,10 @@
   - horizontal (boolean) (default: false)
   - horizontal_grid (object) (default: {})
     format: {
-      left_col_classes (default: 'col-4')
-      right_col_classes (default: 'col-8')
+      left_col_classes (default: 'bcl-card-start-col')
+      right_col_classes (default: 'col')
       gutter (default: '')
+      gutter (default: '') - options: ['small', 'large']
     }
   - variant (string) (default: '')
   - border_variant (string) (default: '')
@@ -63,8 +64,9 @@
 {% set _variant = variant|default('') %}
 {% set _horizontal = horizontal|default(false) %}
 {% set _horizontal_grid = horizontal_grid|default({
-  left_col_classes: 'col-4',
-  right_col_classes: 'col-8'
+  left_col_classes: 'bcl-card-start-col',
+  right_col_classes: 'col',
+  left_col_size: '',
 }) %}
 {% set _border_variant = border_variant|default('') %}
 {% set _text_color = text_color|default('') %}
@@ -170,7 +172,7 @@
   <div class='{{ _body_classes }}'>
   {% if _title is not empty %}
     {% if _title_attributes.class is empty %}
-      {% set _title_attributes = _title_attributes.addClass('fs-5') %}
+      {% set _title_attributes = _title_attributes.addClass('fs-4') %}
     {% endif %}
     {% set _title_attributes = _title_attributes.addClass('card-title') %}
     {% include '@oe-bcl/bcl-heading/heading.html.twig' with {

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

@@ -1,7 +1,10 @@
 {% spaceless %}
 
 {# Parameters:
-  - id (string) (default: '')
+  - title (string) (default: '')
+  - title_tag (string) (default: 'h2')
+  - title_link: (link object) (default: {})
+  - title_attributes: (drupal attrs)
   - autoplay (boolean) (default: true)
   - autoinit (boolean) (default: true)
   - dark (boolean) (default: false)
@@ -25,6 +28,10 @@
   - attributes (drupal attrs)
 #}
 
+{% set _title = title|default('') %}
+{% set _title_tag = title_tag|default('h2') %}
+{% set _title_link = title_link|default({}) %}
+{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _id = id|default('') %}
 {% set _autoinit = autoinit ?? true %}
 {% set _autoplay = autoplay ?? true %}
@@ -39,7 +46,7 @@
 {% set _rounded_indicators = rounded_indicators|default(false) %}
 {% set _disable_touch = disable_touch|default(false) %}
 
-{% set _classes = ['carousel slide'] %}
+{% set _classes = ['carousel', 'slide'] %}
 
 {% if _fade %}
   {% set _classes = _classes|merge(['carousel-fade']) %}
@@ -74,6 +81,15 @@
 
 {% set attributes = attributes.addClass(_classes) %}
 
+{%- if _title is not empty -%}
+  {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+    title: _title,
+    title_tag: _title_tag,
+    title_link: _title_link,
+    attributes: _title_attributes,
+  } only %}
+{%- endif -%}
+
 <div
   {{ attributes }}
 >

package/templates/bcl-content-banner/content-banner.html.twig

@@ -11,7 +11,7 @@
     - image (object)
     - image_size: (string)
     - date: (object)
-      options: ['sm', 'md', 'lg']
+      options: ['sm', 'md', 'lg', 'xl']
     - content: (string)
     - badges: (array of objects of type badge)
     - links: (array of objects of type link)
@@ -63,20 +63,23 @@
 {% set _right_col_classes = 'col-md-8 col-lg-9 col-xxl-8' %}
 
 {% if _image is not empty %}
-  {% set _left_col_classes = 'col-8 col-md-4 col-lg-3 offset-2 offset-md-0' %}
-  {% set _right_col_classes = 'col-md-8 col-lg-9 col-xxl-8' %}
+  {% set _left_col_classes = 'bcl-card-start-col' %}
   {% set _body_classes = 'pt-4 pt-md-0 px-0 px-md-3 pb-0' %}
   {% if _image_size == 'lg' %}
-    {% set _left_col_classes = 'col-md-4' %}
-    {% set _right_col_classes = 'col-md-8' %}
+    {% set _left_col_classes = _left_col_classes ~ ' bcl-size-large' %}
+    {% set _right_col_classes = 'col-12 col-md-7 col-lg-8 col-xl-9 col-xxl-8' %}
   {% endif %}
   {% if _image_size == 'sm' %}
-    {% set _left_col_classes = 'col-6 col-md-4 col-lg-2 offset-3 offset-md-0' %}
+    {% set _left_col_classes = _left_col_classes ~ ' bcl-size-small' %}
+  {% endif %}
+  {% if _image_size == 'xl' %}
+    {% set _left_col_classes = _left_col_classes ~ ' bcl-size-extra-large' %}
+    {% set _right_col_classes = 'col-12 col-lg-7 col-xl-8' %}
   {% endif %}
 {% endif %}
 {% if _date is not empty %}
-  {% set _left_col_classes = 'col-8 col-md-3 col-lg-2 offset-4 offset-md-0' %}
-  {% set _right_col_classes = 'col-md-9 col-lg-10 col-xxl-8' %}
+  {% set _left_col_classes = 'bcl-card-start-col' %}
+  {% set _right_col_classes = 'col-12 col-md col-xxl-9' %}
 {% endif %}
 
 {% set _horizontal_classes = {

package/templates/bcl-description-list/description-list.html.twig

@@ -2,37 +2,59 @@
 
 {#
   Parameters:
-  - title: (string) (default: "")
-  - title_tag: (string) (default: "h2")
+  - title: (string) (default: '')
+  - title_tag: (string) (default: 'h2')
   - title_link: (link object) (default: {})
   - title_attributes (drupal attrs)
+  - bordered (boolean) (default: '')
   - items (array) (default: []): format: [
       {
         term (object or array of object) -format: {
           icon: {} - icon object,
-          label: ""
+          label: ''
         }
         definition (block or array of string)
       },
       ...
     ]
   - variant (string) (default: '') 
-    - option: ["horizontal"]
+    - option: ['horizontal']
 #}
 
 {% set _title = title|default('') %}
 {% set _title_tag = title_tag|default('h2') %}
 {% set _title_link = title_link|default({}) %}
+{% set _bordered = bordered|default(false) %}
+{% set _title_link = title_link|default({}) %}
 {% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _items = items|default([]) %}
 {% set _variant = variant|default('') %}
 
+{% set _classes = ['bcl-description-list'] %}
+
 {% if attributes is empty %}
   {% set attributes = create_attribute() %}
 {% endif %}
 
+{% set _item_classes = '' %}
+
 {% if _variant == 'horizontal' %}
-  {% set attributes = attributes.addClass(["d-md-grid", "grid-3-9"]) %}
+  {% set _item_classes = 'd-md-grid grid-3-9' %}
+  {% if _bordered %}
+    {% set _item_classes = _item_classes ~ ' mb-2-5 pb-2-5' %}
+  {% else %}
+    {% set _item_classes = _item_classes ~ ' mb-3' %}
+  {% endif %}
+{% else %}
+  {% set _item_classes = 'mb-3' %}
+  {% if _bordered %}
+    {% set _item_classes = 'mb-2-5' %}
+    {% set _item_classes = _item_classes ~ ' pb-2-5' %}
+  {% endif %}
+{% endif %}
+
+{% if _bordered %}
+  {% set _item_classes = _item_classes ~ ' border-bottom' %}
 {% endif %}
 
 {% if _title is not empty %}
@@ -44,101 +66,120 @@
   } only %}
 {% endif %}
 
-<dl
+{% set attributes = attributes.addClass(_classes) %}
+
+<div
   {{ attributes }}
 >
   {% for _item in _items %}
-    {% if _item.term is not empty %}
-      {% if _item.term is iterable %}
-        {% if _variant == 'horizontal' %}
-          <div>
-        {% endif %}
-        {% for _term in _item.term %}
-          <dt
-          {% if _variant == 'horizontal' and _term.icon is not empty %}
-            class="d-flex"
-          {% endif %}
-          >
-            {%- if _term.icon is not empty -%}
-              {% set _icon_classes = ["me-2"] %}
-              {% if _variant == 'horizontal' %}
-                {% set _icon_classes = _icon_classes|merge(["mt-1"]) %}
-              {% endif %}
-              {% include '@oe-bcl/bcl-icon/icon.html.twig' with _term.icon|merge({
-                attributes: create_attribute().addClass(_icon_classes)
-              }) only %}
-              <p class="mb-0 d-inline-block">{{ _term.label }}</p>
-            {%- elseif _term.color is not empty -%}
-              <div class="d-flex align-items-center">
-                <span class="p-2 me-2 d-inline-block rounded-1 {{ _term.color }}"></span>{{- _term.label -}}
-              </div>
-            {%- else -%}
-              {{- _term.label -}}
-            {%- endif -%}
-          </dt>
-        {% endfor %}
+  {% if loop.last and _variant != 'horizontal' %}
+    {% set _item_classes = '' %}
+  {% endif %}
+  {% if _item.term is not empty %}
+  <dl
+  {% if _item_classes is not empty %}
+    class="{{ _item_classes }}"
+  {% endif %}
+  >
+    {% if _item.term is iterable %}
+    <dt>
+    {% for _term in _item.term %}
+      {%- if _item.term|length > 1 -%}
+      <div
+      {% if _variant == 'horizontal' and _term.icon is not empty %}
+        class="d-flex"
+      {% endif %}
+      >
+      {%- endif -%}
+      {%- if _term.icon is not empty -%}
+        {% set _icon_classes = ["me-2"] %}
         {% if _variant == 'horizontal' %}
-          </div>
+          {% set _icon_classes = _icon_classes|merge(["mt-1"]) %}
         {% endif %}
-      {% else %}
-        <dt
-          {% if _variant == 'horizontal' and _item.term.icon is not empty %}
-            class="d-flex"
-          {% endif %}
-        >
-          {%- if _item.term.icon is not empty -%}
-            {% set _icon_classes = ["me-2"] %}
-            {% if _variant == 'horizontal' %}
-              {% set _icon_classes = _icon_classes|merge(["mt-1"]) %}
-            {% endif %}
-            {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _item.term.icon|merge({
-              attributes: create_attribute().addClass(_icon_classes)
-            }) only -%}
-            <p class="mb-0 d-inline-block">{{ _item.term.label }}</p>
-          {%- elseif _item.term.color is not empty -%}
-            <div class="d-flex align-items-center">
-              <span class="p-2 me-2 d-inline-block rounded-1 {{ _item.term.color }}"></span>{{- _item.term.label -}}
-            </div>
-          {%- else -%}
-            {{- _item.term.label -}}
-          {%- endif -%}
-        </dt>
+        {% include '@oe-bcl/bcl-icon/icon.html.twig' with _term.icon|merge({
+          attributes: create_attribute().addClass(_icon_classes)
+        }) only %}
+        <p class="mb-0 d-inline-block">{{ _term.label }}</p>
+      {%- elseif _term.color is not empty -%}
+        <div class="d-flex align-items-center">
+          <span class="p-2 me-2 d-inline-block rounded-1 {{ _term.color }}"></span>{{- _term.label -}}
+        </div>
+      {%- else -%}
+        {{- _term.label -}}
+      {%- endif -%}
+      {% if _item.term|length > 1 %}
+      </div>
+      {% endif %}
+    {% endfor %}
+    </dt>
+    {% else %}
+    <dt
+      {% if _variant == 'horizontal' and _item.term.icon is not empty %}
+        class="d-flex"
       {% endif %}
+    >
+    {%- if _item.term.icon is not empty -%}
+      {% set _icon_classes = ["me-2"] %}
+      {% if _variant == 'horizontal' %}
+        {% set _icon_classes = _icon_classes|merge(["mt-1"]) %}
+      {% endif %}
+      {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _item.term.icon|merge({
+        attributes: create_attribute().addClass(_icon_classes)
+      }) only -%}
+      <p class="mb-0 d-inline-block">{{ _item.term.label }}</p>
+    {%- elseif _item.term.color is not empty -%}
+      <div class="d-flex align-items-center">
+        <span class="p-2 me-2 d-inline-block rounded-1 {{ _item.term.color }}"></span>{{- _item.term.label -}}
+      </div>
+    {%- else -%}
+      {{- _item.term.label -}}
+    {%- endif -%}
+    </dt>
     {% endif %}
-    {% if _item.definition is not empty %}
-      {% if _item.definition is iterable %}
-        {% if _variant == 'horizontal' %}
-          <dd>
+  {% endif %}
+  {% if _item.definition is not empty %}
+    {% if _item.definition is iterable %}
+      {% if _variant == 'horizontal' %}
+      <dd
+        {% if _bordered %}
+          class="mb-0"
         {% endif %}
-        {% for _definition in _item.definition %}
-          {% if _variant == 'horizontal' %}<div>{% else %}<dd>{% endif %}
-            {%- if _definition.button is defined -%}
-              {% include '@oe-bcl/bcl-button/button.html.twig' with _definition.button only %}
-            {%- elseif _definition.link is defined %}
-              {% include '@oe-bcl/bcl-link/link.html.twig' with _definition.link only -%}
+      >
+      {% endif %}
+      {% for _definition in _item.definition %}
+        {% if _variant == 'horizontal' %}<div>{% else %}<dd>{% endif %}
+          {%- if _definition.button is defined -%}
+            {% include '@oe-bcl/bcl-button/button.html.twig' with _definition.button only %}
+          {%- elseif _definition.link is defined %}
+            {% include '@oe-bcl/bcl-link/link.html.twig' with _definition.link only -%}
+          {%- else -%}
+            {%- if _definition.icon is defined -%}
+              {%- set _icon_classes = ["me-2"] -%}
+              {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _definition.icon|merge({
+                attributes: create_attribute().addClass(_icon_classes)
+              }) only -%}
+              <p class="mb-0 d-inline-block">{{ _definition.label }}</p>
             {%- else -%}
-              {%- if _definition.icon is defined -%}
-                {%- set _icon_classes = ["me-2"] -%}
-                {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _definition.icon|merge({
-                  attributes: create_attribute().addClass(_icon_classes)
-                }) only -%}
-               <p class="mb-0 d-inline-block">{{ _definition.label }}</p>
-              {%- else -%}
-                {{- _definition.label -}}
-              {%- endif -%}
+              {{- _definition.label -}}
             {%- endif -%}
-          {% if _variant == 'horizontal' %}</div>{% else %}</dd>{% endif %}
-        {% endfor %}
-        {% if _variant == 'horizontal' %}
-          </dd>
-        {% endif %}
-      {% else %}
-        <dd>
-          {%- block definition _item.definition -%}
-        </dd>
+          {%- endif -%}
+        {% if _variant == 'horizontal' %}</div>{% else %}</dd>{% endif %}
+      {% endfor %}
+      {% if _variant == 'horizontal' %}
+      </dd>
+      {% endif %}
+    {% else %}
+    <dd
+      {% if _bordered %}
+        class="mb-0"
       {% endif %}
+    >
+      {%- block definition _item.definition -%}
+    </dd>
     {% endif %}
+  </dl>
+  {% endif %}
   {% endfor %}
-</dl>
+</div>
 
 {% endspaceless %}

package/templates/bcl-fact-figures/fact-figures.html.twig

@@ -29,7 +29,7 @@
 {% set _title_link = title_link|default({}) %}
 {% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _variant = variant|default('default') %}
-{% set _css_classes = ['bcl-fact-figures', 'bcl-fact-figures--' ~ _variant] %}
+{% set _classes = ['bcl-fact-figures', 'bcl-fact-figures--' ~ _variant] %}
 {% set _display_icons = display_icons ?? true %}
 {% set _items = items|default([]) %}
 {% set _grid_columns = grid_columns|default(1) %}
@@ -66,7 +66,7 @@
   {% set attributes = create_attribute() %}
 {% endif %}
 
-{% set attributes = attributes.addClass(_css_classes) %}
+{% set attributes = attributes.addClass(_classes) %}
 
 <div {{ attributes }}>
 {% if _title is not empty %}

package/templates/bcl-featured-media/featured-media.html.twig

@@ -2,8 +2,10 @@
 
 {# Parameters:
   - with_text (boolean) (default: false)
-  - title: (string) (default: '')
-  - title_tag: (string) (default: 'h2')
+  - title (string) (default: '')
+  - title_tag (string) (default: 'h2')
+  - title_link: (link object) (default: {})
+  - title_attributes: (drupal attrs)
   - image: (string) (default: "")
   - poster_image: (string) (default: "")
   - content: (string) (default: "")
@@ -34,6 +36,8 @@
 
 {% set _title = title|default('') %}
 {% set _title_tag = title_tag|default('h2') %}
+{% set _title_link = title_link|default({}) %}
+{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _with_text = with_text|default(false) %}
 {% set _wrapper_classes = 'bcl-featured-item' %}
 {% set _description = description|default('') %}
@@ -57,19 +61,27 @@
   {% set attributes = create_attribute() %}
 {% endif %}
 
+{% if _with_text %}
+  {% set _title_attributes = _title_attributes.addClass(['fw-bold', 'mb-4']) %}
+{% endif %}
+
 {% set attributes = attributes.addClass(["rounded", "overflow-hidden"]) %}
 
 {% if _with_text %}
 <div class="{{ _wrapper_classes }}">
-
-{% if _title is not empty %}
-  {% set _title_classes = 'fw-bold mb-4' %}
-  <{{ _title_tag }} class="{{ _title_classes }}">
-    {{- _title -}}
-  </{{ _title_tag }}>
+  <div class="row">
 {% endif %}
 
-  <div class="row">
+{%- if _title is not empty -%}
+  {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+    title: _title,
+    title_tag: _title_tag,
+    title_link: _title_link,
+    attributes: _title_attributes,
+  } only %}
+{%- endif -%}
+
+{% if _with_text %}
     <div class="{{ _col_classes }} order-{{ _alignment == "right" ? '1' : '2' }}">
       {{- _description|default('') -}}
 

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

@@ -56,11 +56,13 @@
 {% set _translation = translation|default({}) %}
 {% set _icon_path = icon_path|default({}) %}
 
+{% set _classes = ['bcl-file'] %}
+
 {% if attributes is empty %}
   {% set attributes = create_attribute() %}
 {% endif %}
 
-{% set attributes = attributes.addClass(['bcl-file']) %}
+{% set attributes = attributes.addClass(_classes) %}
 
 {% if _icon is not empty %}
   {% set _container_classes = _container_classes ~ ' ms-2-5' %}

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

@@ -21,6 +21,8 @@
 {% set _variant = variant|default('vertical') %}
 {% set _links = links|default([])%}
 
+{% set _classes = ['bcl-links-block'] %}
+
 {% set _title_classes = ['pb-3', 'mb-3', 'border-bottom'] %}
 
 {% if attributes is empty %}
@@ -31,6 +33,8 @@
   {% set attributes = attributes.addClass(['bg-light', 'px-4', 'py-3', 'rounded-2']) %}
 {% endif %}
 
+{% set attributes = attributes.addClass(_classes) %}
+
 <div
   {{ attributes }}
 >