Skip to content

Commit a97baf1

Browse files
committed
Removed deprecated spaceless filter
1 parent a041f2c commit a97baf1

11 files changed

+32
-48
lines changed

web/profiles/custom/os2loop/os2loop.info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: OS2Loop
33
type: profile
44
description: 'The OS2Loop profile'
5-
core_version_requirement: ^10
5+
core_version_requirement: ^10 || ^11
66

77
# Optional: Declare your installation profile as a distribution
88
# This will make the installer auto-select this installation profile.

web/profiles/custom/os2loop/themes/os2loop_theme/os2loop_theme.info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ base theme: false
33
name: 'os2loop'
44
description: 'A theme for os2loop.'
55
logo: logo.png
6-
core_version_requirement: ^10
6+
core_version_requirement: ^10 || ^11
77
screenshot: loop.png
88

99
# This breaks `drush site:install` (maybe related to

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--message-read.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* - flaggable: The flaggable entity.
1515
*/
1616
#}
17-
{% apply spaceless %}
17+
1818
{# Attach the flag CSS library. #}
1919
{{ attach_library('flag/flag.link') }}
2020

@@ -39,4 +39,3 @@
3939
<a{{ attributes }} aria-label='{{ title }}'></a>
4040
</div>
4141
</div>
42-
{% endapply %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-favourite.html.twig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* - flaggable: The flaggable entity.
1515
*/
1616
#}
17-
{% apply spaceless %}
1817

1918
{# Depending on the flag action, set the appropriate action class. #}
2019
{% if action == 'unflag' %}
@@ -41,4 +40,3 @@
4140
<span class="visually-hidden">{{ title }}</span>
4241
</a>
4342
</div>
44-
{% endapply %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-subscription-node.html.twig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* - flaggable: The flaggable entity.
1515
*/
1616
#}
17-
{% apply spaceless %}
1817

1918
{# Depending on the flag action, set the appropriate action class. #}
2019
{% set action_class = action == 'unflag' ? 'unsubscribe' : 'subscribe' %}
@@ -37,4 +36,3 @@
3736
<span class="visually-hidden">{{ title }}</span>
3837
</a>
3938
</div>
40-
{% endapply %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-subscription-term.html.twig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* - flaggable: The flaggable entity.
1515
*/
1616
#}
17-
{% apply spaceless %}
1817

1918
{# Depending on the flag action, set the appropriate action class. #}
2019
{% if action == 'unflag' %}
@@ -38,4 +37,3 @@
3837
{% set attributes = attributes.addClass(classes) %}
3938

4039
<a{{ attributes }}>{{ title }}</a>
41-
{% endapply %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-upvote-correct-answer.html.twig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* - flaggable: The flaggable entity.
1515
*/
1616
#}
17-
{% apply spaceless %}
1817

1918
{# Depending on the flag action, set the appropriate action class. #}
2019
{% set action_class = action == 'unflag' ? 'unflag' : 'flag' %}
@@ -31,4 +30,3 @@
3130
{% set attributes = attributes.setAttribute('rel', 'nofollow') %}
3231

3332
<div class="{{ classes|join(' ') }}"><a {{ attributes }} class="btn btn-sm btn-outline-success ml-auto">{{ title }}</a></div>
34-
{% endapply %}

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-upvote-upvote-button.html.twig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* - flaggable: The flaggable entity.
1515
*/
1616
#}
17-
{% apply spaceless %}
1817

1918
{# Depending on the flag action, set the appropriate action class. #}
2019
{% set action_class = action == 'unflag' ? 'unflag' : 'flag' %}
@@ -39,4 +38,3 @@
3938
{% endif %}
4039
</a>
4140
</div>
42-
{% endapply %}
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{% set node = elements['#node'] %}
2-
{% apply spaceless %}
3-
<div class="search-autocomplete search-autocomplete--node search-autocomplete--node--{{ node.bundle }}">
4-
<div class="search-autocomplete-suggestion">
5-
<h2 class="content-title font-weight-bold">{{ label }}</h2>
6-
{# <span class="badge bg-light text-dark node-bundle node-bundle-{{ node.bundle }}">{{ node.bundle|t }}</span> #}
7-
<span class="subject">{{ elements['os2loop_shared_subject'] }}</span>
8-
</div>
2+
<div class="search-autocomplete search-autocomplete--node search-autocomplete--node--{{ node.bundle }}">
3+
<div class="search-autocomplete-suggestion">
4+
<h2 class="content-title font-weight-bold">{{ label }}</h2>
5+
{# <span class="badge bg-light text-dark node-bundle node-bundle-{{ node.bundle }}">{{ node.bundle|t }}</span> #}
6+
<span class="subject">{{ elements['os2loop_shared_subject'] }}</span>
97
</div>
10-
{% endapply %}
8+
</div>
9+

web/profiles/custom/os2loop/themes/os2loop_theme/templates/form/select.html.twig

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@
1010
* @see template_preprocess_select()
1111
*/
1212
#}
13-
{% apply spaceless %}
14-
<select{{ attributes.addClass('custom-select') }}>
15-
{% for option in options %}
16-
{% if option.type == 'optgroup' %}
17-
<optgroup label="{{ option.label }}">
18-
{% for sub_option in option.options %}
19-
<option value="{{ sub_option.value }}" {{ sub_option.selected ? ' selected="selected"' }}>{{ sub_option.label }}</option>
20-
{% endfor %}
21-
</optgroup>
22-
{% elseif option.type == 'option' %}
23-
<option value="{{ option.value }}" {{ option.selected ? ' selected="selected"' }}>{{ option.label }}</option>
24-
{% endif %}
25-
{% endfor %}
26-
</select>
27-
{% endapply %}
13+
<select{{ attributes.addClass('custom-select') }}>
14+
{% for option in options %}
15+
{% if option.type == 'optgroup' %}
16+
<optgroup label="{{ option.label }}">
17+
{% for sub_option in option.options %}
18+
<option value="{{ sub_option.value }}" {{ sub_option.selected ? ' selected="selected"' }}>{{ sub_option.label }}</option>
19+
{% endfor %}
20+
</optgroup>
21+
{% elseif option.type == 'option' %}
22+
<option value="{{ option.value }}" {{ option.selected ? ' selected="selected"' }}>{{ option.label }}</option>
23+
{% endif %}
24+
{% endfor %}
25+
</select>

0 commit comments

Comments
 (0)