Skip to content

Commit 94fa0bb

Browse files
committed
Merge branch 'main' into develop
2 parents cdc0eb6 + 0004221 commit 94fa0bb

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
- [PR-395](https://github.com/itk-dev/os2loop/pull/395)
12+
7840: Improved handling of empty step title
1113
- [PR-394](https://github.com/itk-dev/os2loop/pull/394)
1214
Made `NGINX_FASTCGI_READ_TIMEOUT` have effect
1315

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
]
5050
%}
5151

52-
{% set has_title = content.os2loop_documents_step_title['#title'] is not null %}
53-
5452
{% set expanded = app.request.query.get('expanded') %}
5553
{% set class_collapsed = not expanded ? 'collapsed' %}
5654

@@ -61,13 +59,13 @@
6159
{% if 'print/pdf' in url('<current>')['#markup'] %}
6260
<span class="{{ class_collapsed }} step--collapse-toggle">
6361
<span class="bold">
64-
{{ has_title ? content.os2loop_documents_step_title : content.os2loop_documents_step_text }}
62+
{{ content.os2loop_documents_step_title }}
6563
</span>
6664
</span>
6765
{% else %}
6866
<a class="{{ class_collapsed }} step--collapse-toggle" type="button" data-toggle="collapse" data-target="#paragraph-id-{{ paragraph.id() }}">
69-
<span class="bold {{ has_title ? 'line-clamp-1' }}">
70-
{{ has_title ? content.os2loop_documents_step_title : content.os2loop_documents_step_text }}
67+
<span class="bold">
68+
{{ content.os2loop_documents_step_title }}
7169
</span>
7270
</a>
7371
{% endif %}

0 commit comments

Comments
 (0)