@openeuropa/bcl-theme-default 0.25.0 → 0.27.0

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -71,115 +71,117 @@
 <div
   {{ attributes }}
 >
+  <dl>
   {% for _item in _items %}
   {% 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 %}
+    <div
+    {% 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' %}
+            {% 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 -%}
+        {% 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 %}
       >
-      {%- endif -%}
-      {%- if _term.icon is not empty -%}
+      {%- 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 _term.icon|merge({
+        {%- 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">{{ _term.label }}</p>
-      {%- elseif _term.color is not empty -%}
+        }) 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 {{ _term.color }}"></span>{{- _term.label -}}
+          <span class="p-2 me-2 d-inline-block rounded-1 {{ _item.term.color }}"></span>{{- _item.term.label -}}
         </div>
       {%- else -%}
-        {{- _term.label -}}
+        {{- _item.term.label -}}
       {%- endif -%}
-      {% if _item.term|length > 1 %}
-      </div>
+      </dt>
       {% 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 %}
-  {% endif %}
-  {% if _item.definition is not empty %}
-    {% if _item.definition is iterable %}
-      {% if _variant == 'horizontal' %}
+    {% if _item.definition is not empty %}
+      {% if _item.definition is iterable %}
+        {% if _variant == 'horizontal' %}
+        <dd
+          {% if _bordered %}
+            class="mb-0"
+          {% endif %}
+        >
+        {% 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 -%}
+                {{- _definition.label -}}
+              {%- endif -%}
+            {%- endif -%}
+          {% if _variant == 'horizontal' %}</div>{% else %}</dd>{% endif %}
+        {% endfor %}
+        {% if _variant == 'horizontal' %}
+        </dd>
+        {% endif %}
+      {% else %}
       <dd
         {% if _bordered %}
           class="mb-0"
         {% endif %}
       >
-      {% 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 -%}
-              {{- _definition.label -}}
-            {%- endif -%}
-          {%- endif -%}
-        {% if _variant == 'horizontal' %}</div>{% else %}</dd>{% endif %}
-      {% endfor %}
-      {% if _variant == 'horizontal' %}
+        {%- block definition _item.definition -%}
       </dd>
       {% endif %}
-    {% else %}
-    <dd
-      {% if _bordered %}
-        class="mb-0"
-      {% endif %}
-    >
-      {%- block definition _item.definition -%}
-    </dd>
-    {% endif %}
-  </dl>
+    </div>
   {% endif %}
   {% endfor %}
+  </dl>
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - id (string) (default: 'dropdown-' random(1000))
@@ -127,4 +127,4 @@
 </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -124,4 +124,4 @@
   </div>
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - with_text (boolean) (default: false)
@@ -67,6 +67,15 @@
 
 {% set attributes = attributes.addClass(["rounded", "overflow-hidden"]) %}
 
+{% if _image is not empty %}
+  {% set attributes = attributes.addClass(["d-inline-flex", "flex-wrap"]) %}
+  {% if _content_classes is not empty %}
+    {% set _content_classes = _content_classes ~ ' flex-1 w-min-content' %}
+  {% else %}
+    {% set _content_classes = 'flex-1 w-min-content' %}
+  {% endif %}
+{% endif %}
+
 {% if _with_text %}
 <div class="{{ _wrapper_classes }}">
   <div class="row">
@@ -141,4 +150,4 @@
 </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -39,7 +39,7 @@
 {# Internal properties #}
 
 {% set _icon = icon|default({}) %}
-{% set _icon_inline = icon_inline|default(true) %}
+{% set _icon_inline = icon_inline ?? true %}
 {% set _title = title|default('') %}
 {% set _title_tag = title_tag|default('h2') %}
 {% set _title_link = title_link|default({}) %}
@@ -221,4 +221,4 @@
   {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - variant (string) (default: 'neutral')
@@ -86,4 +86,4 @@
   </div>
 </footer>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title: (string) (default: '')
@@ -147,4 +147,4 @@
 {% endif %}
 </form>
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-form-input/form-input.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -180,4 +180,4 @@
 </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
 Parameters:
@@ -102,7 +102,7 @@ Parameters:
                     {% if _item.caption is not empty or item.caption_title is not empty %}
                       <div class="bcl-gallery__item-caption">
                       {% if _item.caption_title is not empty %}
-                        <h5>{{ _item.caption_title }}</h5>
+                        <p class="fs-5">{{ _item.caption_title }}</p>
                       {% endif %}
                       {% if _item.caption is not empty %}
                         <div class="bcl-gallery__item-description">
@@ -204,4 +204,4 @@ Parameters:
   
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - variant (string) (default: 'neutral')
@@ -110,4 +110,4 @@
   {% include '@oe-bcl/bcl-language-list/language-list.html.twig' with _language_modal only %}
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title (string) (default: '')
@@ -37,4 +37,4 @@
 </{{ _title_tag }}>
 {% endif -%}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - name (string) (default: '')
@@ -32,4 +32,4 @@
   <use xlink:href="{{ _path ~ "#" ~ _name }}"/>
 </svg>
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-inpage-navigation/inpage-navigation.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
 Parameters:
@@ -41,4 +41,4 @@ Parameters:
   } only %}
 </nav>
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-language-list/language-list-grid.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -65,4 +65,4 @@
   {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - overlay (boolean) (default: false)
@@ -108,4 +108,4 @@
   </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-language-switcher/language-switcher.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - id (string) (default: collapse-{random number 0-1000}) - collapse custom id - optional
@@ -30,15 +30,21 @@
 
 <div class="collapse mt-3" id="{{ _id }}">
   <div
-    class="d-md-grid"
-    style="grid-auto-flow: column; grid-template-rows: repeat(4, 1fr)"
+    class="d-grid"
+    style="grid-auto-flow: row;  grid-template-columns: repeat(auto-fit, minmax(4rem, 8rem))"
   >
     {% for language in languages %}
       {% include '@oe-bcl/bcl-link/link.html.twig' with language|merge({
-        attributes: create_attribute().addClass(["btn", "btn-link", "d-block", "ps-0", "text-start"])
+        attributes: create_attribute().addClass(
+          [ "btn",
+            "btn-link",
+            "d-block",
+            "ps-0",
+            "text-start"
+          ])
       }) only %}
     {% endfor %}
   </div>
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - label (string) (default: '')
@@ -86,4 +86,4 @@
   {%- endif -%}
 </a>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title: (string) (default: '')
@@ -73,4 +73,4 @@
   {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - flush (boolean) (default: false)
@@ -117,4 +117,4 @@
 </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title: (string) (default: '')
@@ -196,4 +196,4 @@
 {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - size (string) (sm, lg, xl, fullscreen) default('')
@@ -78,4 +78,4 @@
   </div>
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - collapse_id (string) (default: '')
@@ -78,17 +78,17 @@
 
   {% if not _disable_collapse %}
     <button
-      class='navbar-toggler'
-      type='button'
-      data-bs-toggle='collapse'
+      class="navbar-toggler"
+      type="button"
+      data-bs-toggle="collapse"
       data-bs-target='#{{ _collapse_id }}'
       aria-controls='{{ _collapse_id }}'
-      aria-expanded='false'
-      aria-label='Toggle navigation'
+      aria-expanded="false"
+      aria-label="Toggle navigation"
     >
-      <span class='navbar-toggler-icon'></span>
+      <span class="navbar-toggler-icon"></span>
     </button>
-    <div class='collapse navbar-collapse' id='{{ _collapse_id }}'>
+    <div class="collapse navbar-collapse" id='{{ _collapse_id }}'>
   {% endif %}
   {% block navigation %}
     {% if _navigation is not empty %}
@@ -106,4 +106,4 @@
   </div>
 </nav>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,5 +1,5 @@
 {% import _self as navigation %}
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - id (string) (default: '')
@@ -27,7 +27,7 @@
 
 {# Define main macro #}
 {% macro render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) %}
-{% spaceless %}
+{% apply spaceless %}
   {% import _self as navigation %}
 
   {% set _id = id|default('') %}
@@ -114,7 +114,7 @@
             role="tab"
           {% endif %}
         >
-        {% elseif _tabs %}
+        {% elseif _tabs and _item.dropdown is not defined %}
           {% set _item = _item|merge({
             attributes: _item.attributes.setAttribute("role", "tab"),
             }) 
@@ -171,9 +171,9 @@
     {%- endblock -%}
   </div>
   {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 
 {{ navigation.render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) }}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title: (string) (default: '')
@@ -11,9 +11,12 @@
   - with_body_scroll (boolean) (default: false)
   - with_backdrop (boolean) (default: true)
   - with_close (boolean) (default: true)
+  - close_aria_label (default: '')
   - extra_classes_body (string) (default: '')
   - extra_classes_header (string) (default: '')
   - extra_classes_close (string) (default: '')
+  - responsiveness (string) (default: '')
+    options: ['sm', 'md', 'lg', 'xl', 'xxl']
   - attributes (drupal attrs)
 #}
 
@@ -25,13 +28,20 @@
 {% set _id = id|default('') %}
 {% set _body = body|default('') %}
 {% set _with_body_scroll = with_body_scroll|default(false) %}
-{% set _with_backdrop = with_backdrop|default(true) %}
-{% set _with_close = with_close|default(true) %}
+{% set _with_backdrop = with_backdrop ?? true %}
+{% set _with_close = with_close ?? true %}
+{% set _close_aria_label = close_aria_label|default('') %}
 {% set _extra_classes_body = extra_classes_body|default('') %}
 {% set _extra_classes_header = extra_classes_header|default('') %}
 {% set _extra_classes_close = extra_classes_close|default('') %}
+{% set _responsiveness = responsiveness|default('') %}
+
+{% if _responsiveness is not empty %}
+ {% set _classes = ['offcanvas-' ~ _responsiveness] %}
+{% else %}
+ {% set _classes = ['offcanvas'] %}
+{% endif %}
 
-{% set _classes = ['offcanvas'] %}
 {% set _class_body = 'offcanvas-body' ~ (_extra_classes_body ? ' ' ~ _extra_classes_body : '') %}
 {% set _class_header = 'offcanvas-header' ~ (_extra_classes_header ? ' ' ~ _extra_classes_header : '') %}
 
@@ -82,6 +92,7 @@
     {% set button_attributes = create_attribute()
                               .addClass(['btn-close', 'text-reset'])
                               .setAttribute('data-bs-dismiss', 'offcanvas')
+                              .setAttribute('aria-label', _close_aria_label)
     %}
     {% if _extra_classes_close is not empty %}
       {% set button_attributes = button_attributes.addClass(_extra_classes_close) %}
@@ -104,4 +115,4 @@
 {%- endif -%}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - size (string) (default: '')
@@ -57,7 +57,7 @@
 {% set _alignment = alignment|default('') %}
 {% set _aria_label = aria_label|default('') %}
 {% set _enable_prev_next_icon = enable_prev_next_icon|default(false) %}
-{% set _enable_first_last_icon = enable_first_last_icon|default(true) %}
+{% set _enable_first_last_icon = enable_first_last_icon ?? true %}
 {% set _items = items|default([]) %}
 {% set _first = first|default({}) %}
 {% set _next = next|default({}) %}
@@ -271,4 +271,4 @@
   </ul>
 </nav>
 
-{% endspaceless %}
+{% endapply %}