Skip to content

Commit 1f6c01d

Browse files
authored
Merge pull request #62 from ASUWebPlatforms/release-2.14.1
Release 2.14.1
2 parents 55aa64e + 08aab1a commit 1f6c01d

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"behat/behat": "3.14.0",
5757
"behat/mink-goutte-driver": "2.0",
5858
"dmore/behat-chrome-extension": "1.4.0",
59-
"drupal/core-dev": "10.2.5",
59+
"drupal/core-dev": "10.2.10",
6060
"drupal/drupal-driver": "2.2.2",
6161
"drupal/drupal-extension": "5.0.0",
6262
"genesis/behat-fail-aid": "3.7.5",
@@ -190,7 +190,8 @@
190190
"oomphinc/composer-installers-extender": true,
191191
"phpstan/extension-installer": true,
192192
"zaporylie/composer-drupal-optimizations": true,
193-
"php-http/discovery": true
193+
"php-http/discovery": true,
194+
"tbachert/spi": false
194195
}
195196
}
196197
}

upstream-configuration/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"drupal/components": "3.0.0-beta3",
1515
"drupal/config_readonly": "1.0.0-beta5",
1616
"drupal/config_update": "2.0.0-alpha3",
17-
"drupal/core-composer-scaffold": "10.2.7",
18-
"drupal/core-recommended": "10.2.7",
17+
"drupal/core-composer-scaffold": "10.2.10",
18+
"drupal/core-recommended": "10.2.10",
1919
"drupal/crop": "2.3.0",
2020
"drupal/ctools": "4.1.0",
2121
"drupal/current_page_crumb": "1.5.0",
@@ -68,5 +68,5 @@
6868
"config": {
6969
"sort-packages": true
7070
},
71-
"version": "2.14.0"
71+
"version": "2.14.1"
7272
}

web/modules/webspark/webspark_module_views_pager/templates/asu-pager.html.twig

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* @ingroup themeable
1313
*/
1414
#}
15+
1516
{% if alignment == 'right' %}
1617
{% set alignment = 'justify-content-end' %}
1718
{% elseif alignment == 'center' %}
@@ -25,17 +26,21 @@
2526
{% else %}
2627
{% set page_link_icon = '' %}
2728
{% endif %}
29+
2830
{# DESKTOP #}
2931
{% set items = desktop.items %}
3032
{% set ellipses = desktop.ellipses %}
31-
<div class="d-none d-lg-block">
32-
{% include '@webspark_module_views_pager/templates/asu-pager-nav.html.twig' %}
33-
</div>
33+
{% if items %}
34+
<div class="d-none d-lg-block">
35+
{% include '@webspark_module_views_pager/templates/asu-pager-nav.html.twig' %}
36+
</div>
37+
{% endif %}
38+
3439
{# MOBILE #}
3540
{% set items = mobile.items %}
3641
{% set ellipses = mobile.ellipses %}
37-
<div class="d-lg-none">
38-
{% if items %}
42+
{% if items %}
43+
<div class="d-lg-none">
3944
{% include '@webspark_module_views_pager/templates/asu-pager-nav.html.twig' %}
40-
{% endif %}
41-
</div>
45+
</div>
46+
{% endif %}

web/profiles/webspark/webspark/webspark.info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Webspark
22
type: profile
33
core_version_requirement: ^9.0 || ^10
44
description: 'ASU custom profile.'
5-
version: 2.14.0
5+
version: 2.14.1
66
distribution:
77
name: 'Webspark'
88
install:

0 commit comments

Comments
 (0)