@openeuropa/bcl-theme-joinup 1.10.10 → 1.10.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/css/oe-bcl-joinup.css +1 -0
- package/css/oe-bcl-joinup.css.map +1 -1
- package/css/oe-bcl-joinup.min.css +1 -1
- package/css/oe-bcl-joinup.min.css.map +1 -1
- package/package.json +6 -6
- package/templates/bcl-button/button.html.twig +1 -17
- package/templates/bcl-content-banner/content-banner.html.twig +10 -4
- package/templates/bcl-link/link.html.twig +9 -1
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@openeuropa/bcl-theme-joinup",
|
|
3
3
|
"author": "European Commission",
|
|
4
4
|
"license": "EUPL-1.2",
|
|
5
|
-
"version": "1.10.
|
|
5
|
+
"version": "1.10.11",
|
|
6
6
|
"description": "OE - BCL theme joinup",
|
|
7
7
|
"scripts": {
|
|
8
8
|
"align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
"@ecl/resources-eu-logo": "3.7.1",
|
|
29
29
|
"@ecl/resources-flag-icons": "3.7.1",
|
|
30
30
|
"@fontsource/roboto": "5.2.8",
|
|
31
|
-
"@openeuropa/bcl-bootstrap": "^1.10.
|
|
32
|
-
"@openeuropa/bcl-builder": "^1.10.
|
|
33
|
-
"@openeuropa/bcl-theme-default": "^1.10.
|
|
34
|
-
"@openeuropa/bcl-twig-templates": "^1.10.
|
|
31
|
+
"@openeuropa/bcl-bootstrap": "^1.10.11",
|
|
32
|
+
"@openeuropa/bcl-builder": "^1.10.11",
|
|
33
|
+
"@openeuropa/bcl-theme-default": "^1.10.11",
|
|
34
|
+
"@openeuropa/bcl-twig-templates": "^1.10.11",
|
|
35
35
|
"@rollup/plugin-replace": "6.0.2",
|
|
36
36
|
"copyfiles": "2.4.1",
|
|
37
37
|
"cross-env": "10.1.0",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"design-system",
|
|
58
58
|
"twig"
|
|
59
59
|
],
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "82aecf2f60f8bd8f9afd447ea0d044396f085823"
|
|
61
61
|
}
|
|
@@ -68,23 +68,7 @@
|
|
|
68
68
|
})
|
|
69
69
|
%}
|
|
70
70
|
{%- if _label is not empty and not _remove_icon_spacers %}
|
|
71
|
-
{%-
|
|
72
|
-
{%- set _icon = _icon|merge({
|
|
73
|
-
attributes: create_attribute()
|
|
74
|
-
})
|
|
75
|
-
%}
|
|
76
|
-
{%- endif %}
|
|
77
|
-
{%- if _icon_position == 'before' %}
|
|
78
|
-
{%- set _icon = _icon|merge({
|
|
79
|
-
attributes: _icon.attributes.addClass('me-' ~ _icon_spacing ~ '2-5')
|
|
80
|
-
})
|
|
81
|
-
%}
|
|
82
|
-
{%- else %}
|
|
83
|
-
{%- set _icon = _icon|merge({
|
|
84
|
-
attributes: _icon.attributes.addClass('ms-' ~ _icon_spacing ~ '2-5')
|
|
85
|
-
})
|
|
86
|
-
%}
|
|
87
|
-
{%- endif %}
|
|
71
|
+
{%- set attributes = attributes.addClass(['gap-' ~ _icon_spacing ~ '2-5']) %}
|
|
88
72
|
{%- endif %}
|
|
89
73
|
{%- set _icon_markup -%}
|
|
90
74
|
{%- include '@oe-bcl/bcl-icon/icon.html.twig' with _icon only -%}
|
|
@@ -43,6 +43,11 @@
|
|
|
43
43
|
{% set _image_size = image_size|default('md') %}
|
|
44
44
|
{% set _action_bar = action_bar|default('') %}
|
|
45
45
|
{% set _date = date|default({}) %}
|
|
46
|
+
{%- set _action_bar_content -%}
|
|
47
|
+
{%- block action_bar -%}
|
|
48
|
+
{{ _action_bar }}
|
|
49
|
+
{%- endblock -%}
|
|
50
|
+
{%- endset -%}
|
|
46
51
|
|
|
47
52
|
{%- if attributes is empty %}
|
|
48
53
|
{%- set attributes = create_attribute() %}
|
|
@@ -127,10 +132,11 @@
|
|
|
127
132
|
<div {{ attributes }}>{# -#}
|
|
128
133
|
<div class="container">
|
|
129
134
|
{%- include '@oe-bcl/bcl-card/card.html.twig' with _card %}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
135
|
+
{%- if _action_bar_content|trim is not empty -%}
|
|
136
|
+
<div class="position-relative z-1">{# -#}
|
|
137
|
+
{{- _action_bar_content -}}
|
|
138
|
+
</div>{# -#}
|
|
139
|
+
{%- endif -%}
|
|
134
140
|
</div>{# -#}
|
|
135
141
|
</div>
|
|
136
142
|
{#--#}
|
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
- icon (icon object) (default: {})
|
|
10
10
|
- icon_position (string) (default: after)
|
|
11
11
|
- options ['after', 'before']
|
|
12
|
+
- icon_display (string) (default: '')
|
|
13
|
+
- options ['flex', 'inline-flex']
|
|
12
14
|
- remove_icon_spacers (boolean) (default: false)
|
|
13
15
|
- attributes (drupal attrs)
|
|
14
16
|
#}
|
|
@@ -21,12 +23,18 @@
|
|
|
21
23
|
{% set _standalone = standalone ?? false %}
|
|
22
24
|
{% set _icon = icon|default({}) %}
|
|
23
25
|
{% set _icon_position = icon_position|default('after') %}
|
|
26
|
+
{% set _icon_display = icon_display|default('') %}
|
|
27
|
+
{% set _use_icon_display = _icon_display in ['flex', 'inline-flex'] %}
|
|
24
28
|
{% set _remove_icon_spacers = remove_icon_spacers ?? false %}
|
|
25
29
|
|
|
26
30
|
{%- set _classes = [] %}
|
|
27
31
|
|
|
32
|
+
{%- if _use_icon_display and not _remove_icon_spacers %}
|
|
33
|
+
{%- set _classes = _classes|merge(['d-' ~ _icon_display, 'gap-2-5']) %}
|
|
34
|
+
{%- endif %}
|
|
35
|
+
|
|
28
36
|
{%- if _icon is not empty %}
|
|
29
|
-
{%- if _label is not empty and not _remove_icon_spacers %}
|
|
37
|
+
{%- if _label is not empty and not _remove_icon_spacers and not _use_icon_display %}
|
|
30
38
|
{%- if _icon.attributes is empty %}
|
|
31
39
|
{%- set _icon = _icon|merge({
|
|
32
40
|
attributes: create_attribute()
|