@openeuropa/bcl-theme-joinup 1.2.2 → 1.4.0

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/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.2.2",
5
+ "version": "1.4.0",
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": "4.5.8",
31
- "@openeuropa/bcl-bootstrap": "^1.2.2",
32
- "@openeuropa/bcl-builder": "^1.2.2",
33
- "@openeuropa/bcl-theme-default": "^1.2.2",
34
- "@openeuropa/bcl-twig-templates": "^1.2.2",
31
+ "@openeuropa/bcl-bootstrap": "^1.4.0",
32
+ "@openeuropa/bcl-builder": "^1.4.0",
33
+ "@openeuropa/bcl-theme-default": "^1.4.0",
34
+ "@openeuropa/bcl-twig-templates": "^1.4.0",
35
35
  "copyfiles": "2.4.1",
36
36
  "cross-env": "7.0.3",
37
37
  "flag-icons": "6.9.2",
@@ -56,5 +56,5 @@
56
56
  "design-system",
57
57
  "twig"
58
58
  ],
59
- "gitHead": "03e3f25dcc61e449566c32a78213363e7d18afd0"
59
+ "gitHead": "0271b344c41999ea181851f229385df1d539047b"
60
60
  }
@@ -93,7 +93,7 @@
93
93
  icon: _item.icon|merge({
94
94
  path: _icon_path,
95
95
  size: 'l',
96
- attributes: _icon_attributes.addClass('mb-2'),
96
+ attributes: _icon_attributes.addClass(['mb-2', 'icon--primary']),
97
97
  })
98
98
  }) %}
99
99
  {% include '@oe-bcl/bcl-icon/icon.html.twig' with _item.icon only %}
@@ -69,18 +69,21 @@
69
69
  {% endif %}
70
70
  </div>
71
71
  <div class="col-12 col-md-3 align-self-end text-md-end">
72
- {% include '@oe-bcl/bcl-link/link.html.twig' with _item.download|merge({
72
+ {% set download_attributes = create_attribute()
73
+ .setAttribute('download', true)
74
+ .setAttribute('target', '_blank')
75
+ .addClass(['d-block', 'standalone', 'mt-1'])
76
+ %}
77
+ {% set _download_item = _item.download|merge({
73
78
  icon_position: "after",
74
79
  icon: {
75
80
  name: "download",
76
81
  size: "fluid",
77
82
  path: _icon_path,
78
- },
79
- attributes: create_attribute()
80
- .setAttribute('download', true)
81
- .setAttribute('target', '_blank')
82
- .addClass(['d-block', 'standalone', 'mt-1'])
83
- }) only %}
83
+ }|merge(_item.download.icon|default({})),
84
+ attributes: download_attributes.merge(_item.download.attributes|default(create_attribute()))
85
+ }) %}
86
+ {% include '@oe-bcl/bcl-link/link.html.twig' with _download_item only %}
84
87
  </div>
85
88
  </div>
86
89
  {% endif %}
@@ -138,17 +138,18 @@
138
138
  </small>
139
139
  {% endif %}
140
140
  </div>
141
+ {% set download_attributes = create_attribute()
142
+ .setAttribute('download', 'true')
143
+ .setAttribute('target', '_blank')
144
+ .addClass(['standalone', 'align-self-center', 'd-inline-block', 'mt-1', 'mt-md-0', 'flex-shrink-0']) %}
141
145
  {% set _download = _download|merge({
142
146
  icon_position: "after",
143
147
  icon: {
144
148
  name: "download",
145
149
  size: "fluid",
146
150
  path: _icon_path,
147
- },
148
- attributes: create_attribute()
149
- .setAttribute('download', true)
150
- .setAttribute('target', '_blank')
151
- .addClass(['standalone', 'align-self-center', 'd-inline-block', 'mt-1', 'mt-md-0', 'flex-shrink-0'])
151
+ }|merge(_download.icon|default({})),
152
+ attributes: download_attributes.merge(_download.attributes|default(create_attribute()))
152
153
  }) %}
153
154
  {% include '@oe-bcl/bcl-link/link.html.twig' with _download only %}
154
155
  </div>
@@ -35,18 +35,18 @@
35
35
 
36
36
  {% set attributes = attributes.addClass(_classes) %}
37
37
 
38
- <div
39
- {{ attributes }}
40
- >
41
- {% if _title is not empty %}
42
- {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
43
- title: _title,
44
- title_tag: _title_tag,
45
- title_link: _title_link,
46
- attributes: _title_attributes.addClass(_title_classes),
47
- } only %}
48
- {% endif %}
49
- {% if _links is not empty and _links is iterable %}
38
+ {% if _links is not empty and _links is iterable %}
39
+ <div
40
+ {{ attributes }}
41
+ >
42
+ {% if _title is not empty %}
43
+ {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
44
+ title: _title,
45
+ title_tag: _title_tag,
46
+ title_link: _title_link,
47
+ attributes: _title_attributes.addClass(_title_classes),
48
+ } only %}
49
+ {% endif %}
50
50
  <ul class="ps-0 mb-0">
51
51
  {% for _link in _links %}
52
52
  {% if _link.attributes is empty %}
@@ -70,7 +70,7 @@
70
70
  </li>
71
71
  {% endfor %}
72
72
  </ul>
73
- {% endif %}
74
- </div>
73
+ </div>
74
+ {% endif %}
75
75
 
76
76
  {% endapply %}