Skip to content

Commit cd38af3

Browse files
briantschubriantschu
authored
Merge pull request #223 from SLAC/2025q3
2025 Q3 Enhancements and Bugfixes
2 parents 29adc8b + d4d9034 commit cd38af3

16 files changed

Lines changed: 193 additions & 118 deletions

‎source/01-global/html-elements/15-inline-elements/_inline-elements.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@include underline();
99
background-color: transparent;
1010
color: var(--gesso-link-color);
11+
text-decoration: underline;
1112
text-decoration-color: var(--gesso-link-underline-color);
1213
transition-duration: gesso-duration(shortest);
1314
transition-property: background-color, border-color, color, outline-color;

‎source/03-components/callout-box/callout-box.twig‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<div {{ add_attributes({ class: classes } ) }}>
77
<div class="c-callout-box__inner">
88
<div class="c-callout-box__body">
9-
<h2 class="h4">
10-
{{ callout_title }}
11-
</h2>
9+
{% if callout_title %}
10+
<h2 class="h4{% if callout_visual_title %} sr-only{% endif %}">
11+
{{ callout_title }}
12+
</h2>
13+
{% endif %}
1214
{{ callout_content }}
1315
</div>
1416
{% if callout_media %}

‎source/03-components/card/card.twig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<div {{ add_attributes({ 'class': classes } ) }}>
1818
{% set modifier_classes = '' %}
1919
<div class="c-card__body{% if alignment %} u-fade-{{ alignment }}-desktop{% endif %}">
20-
{% if is_event_list_card %}
21-
{% include '@components/event-date/event-date.twig' %}
22-
{% endif %}
2320

2421
{% if type and not is_teaser %}
2522
<div class="c-kicker c-card__type">
@@ -104,7 +101,7 @@
104101
</div>
105102
{% endif %}
106103
</div>
107-
{% if media and not is_event_list_card %}
104+
{% if media %}
108105
<div class="c-card__media">
109106
{{ media }}
110107

‎source/03-components/event-details/event-details.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
padding-block: gesso-spacing(9) 30px;
3737
}
3838

39+
&:only-child {
40+
padding-top: 0;
41+
}
42+
3943
&:not(:last-child) {
4044
border-bottom: 1px solid gesso-grayscale(gray-4);
4145
}

‎source/03-components/event-details/event-details.twig‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010

1111
<div {{ add_attributes({ class: classes } ) }}>
1212

13-
<div class="c-event-details__image">
14-
{% if image %}
13+
{% if image %}
14+
<div class="c-event-details__image">
15+
1516
{{ image }}
1617
<div class="c-card__gradient"></div>
17-
{% endif %}
18-
{% if start_date %}
19-
{% include '@components/event-date/event-date.twig' %}
20-
{% endif %}
21-
</div>
18+
19+
{% if start_date %}
20+
{% include '@components/event-date/event-date.twig' %}
21+
{% endif %}
22+
</div>
23+
{% endif %}
2224

2325
<div class="c-event-details__section">
2426
{% include '@components/page-title/page-title.twig' with {

‎source/03-components/figure/_figure.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
&.u-align-center,
1616
&.align-center {
1717
clear: both;
18-
margin: em(7px, 18px) auto 0;
18+
margin: 0 auto rem(gesso-spacing(3));
1919
max-width: gesso-constrain(images);
2020
width: 100%;
2121

@@ -85,7 +85,7 @@
8585
font-style: normal;
8686
font-weight: gesso-font-weight(regular);
8787
line-height: gesso-line-height(tight);
88-
margin-top: rem(gesso-spacing(2.5));
88+
margin-top: rem(gesso-spacing(1.5));
8989
max-width: 920px;
9090
width: 100%;
9191

‎templates/content/node--event--card.html.twig‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,13 @@
9090
#}
9191
{% set multiyear_event = event_start_date|date('y')|number_format != event_end_date|date('y')|number_format %}
9292
{% set multiday_event = multiyear_event or event_start_date|date('z')|number_format < event_end_date|date('z')|number_format %}
93-
{% set all_day_event_text = content.field_smart_date[0]["end"] is null ? content.field_smart_date[0]["start"]["#text"]["time"] : FALSE %}
93+
{% if content.field_smart_date[0]["end"] is null %}
94+
{% set all_day_event_text = content.field_smart_date[0]["start"]["#text"]["time"] %}
95+
{% elseif content.field_smart_date[0]["end"]["#text"]["time"]["#format"] is null %}
96+
{% set all_day_event_text = content.field_smart_date[0]["end"]["#text"]["time"] %}
97+
{% else %}
98+
{% set all_day_event_text = FALSE %}
99+
{% endif %}
94100

95101
{#
96102
/**
@@ -101,15 +107,18 @@
101107
#}
102108

103109
{% set datetime_composed %}
104-
{% if all_day_event_text %}
105-
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
106-
{% elseif multiday_event == false %}
107-
{{ event_start_date|date("l, F j, Y") }}
108-
·
109-
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
110-
{% else %}
111-
{{- event_start_date|date("l, F j, Y") }}&nbsp;&nbsp;–&nbsp;&nbsp;{{ event_end_date|date("l, F j, Y") }}
112-
{% endif %}
110+
{% if all_day_event_text and multiday_event == false %}
111+
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
112+
{% elseif multiday_event == true and all_day_event_text %}
113+
{{ event_start_date|date("l, F j, Y") }} – {{ event_end_date|date("l, F j, Y") }}
114+
{% elseif multiday_event == false %}
115+
{{ event_start_date|date("l, F j, Y") }}
116+
·
117+
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
118+
{% else %}
119+
{{ event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }} –
120+
{{ event_end_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) -}}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
121+
{% endif %}
113122
{% endset %}
114123

115124

@@ -126,13 +135,13 @@
126135

127136
{% set is_past_event = node.isPastEvent() %}
128137

129-
{% set card_media %}
130-
{% if content.field_image|field_value is not empty %}
131-
{{ content.field_image|field_value }}
132-
{% elseif site_setting_entity_by_name('event_default_motif_image') %}
133-
{{ drupal_entity('media', site_setting_entity_by_name('event_default_motif_image').field_motif_image.target_id, 'card_image_only') }}
134-
{% endif %}
135-
{% endset %}
138+
{% if content.field_image|field_value is not empty %}
139+
{% set card_media = content.field_image|field_value %}
140+
{% elseif site_setting_entity_by_name('event_default_motif_image') %}
141+
{% set card_media = drupal_entity('media', site_setting_entity_by_name('event_default_motif_image').field_motif_image.target_id, 'card_image_only') %}
142+
{% else %}
143+
{% set card_media = FALSE %}
144+
{% endif %}
136145

137146

138147
{#

‎templates/content/node--event--full.html.twig‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,14 @@
9898

9999
{% set event_start_date = content.field_smart_date[0]["#value"] %}
100100
{% set event_end_date = content.field_smart_date[0]["#end_value"] %}
101-
{% set all_day_event_text = content.field_smart_date[0]["end"] is null ? content.field_smart_date[0]["start"]["#text"]["time"] : FALSE %}
101+
102+
{% if content.field_smart_date[0]["end"] is null %}
103+
{% set all_day_event_text = content.field_smart_date[0]["start"]["#text"]["time"] %}
104+
{% elseif content.field_smart_date[0]["end"]["#text"]["time"]["#format"] is null %}
105+
{% set all_day_event_text = content.field_smart_date[0]["end"]["#text"]["time"] %}
106+
{% else %}
107+
{% set all_day_event_text = FALSE %}
108+
{% endif %}
102109

103110
{#
104111
/**
@@ -118,25 +125,19 @@
118125
* midnight. Timezone value is passed to template from view mode integral to date range value.
119126
*/
120127
#}
121-
122128
{% set datetime_composed %}
123-
{% if all_day_event_text %}
124-
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
125-
{% elseif multiday_event == false %}
126-
{{ event_start_date|date("l, F j, Y") }}
127-
·
128-
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
129-
{% else %}
130-
{{- event_start_date|date("l, F j, Y") }}&nbsp;&nbsp;–&nbsp;&nbsp;{{ event_end_date|date("l, F j, Y") }}
131-
{% endif %}
132-
{% endset %}
133-
134-
{% set card_media %}
135-
{% if content.field_image|field_value is not empty %}
136-
{{ content.field_image|field_value }}
137-
{% elseif site_setting_entity_by_name('event_default_motif_image') %}
138-
{{ drupal_entity('media', site_setting_entity_by_name('event_default_motif_image').field_motif_image.target_id, 'card_image_only') }}
139-
{% endif %}
129+
{% if all_day_event_text and multiday_event == false %}
130+
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
131+
{% elseif multiday_event == true and all_day_event_text %}
132+
{{ event_start_date|date("l, F j, Y") }} – {{ event_end_date|date("l, F j, Y") }}
133+
{% elseif multiday_event == false %}
134+
{{ event_start_date|date("l, F j, Y") }}
135+
·
136+
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
137+
{% else %}
138+
{{ event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }} –<br />
139+
{{ event_end_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) -}}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
140+
{% endif %}
140141
{% endset %}
141142

142143
{% set event_content %}
@@ -195,7 +196,7 @@
195196
{% include '@templates/event-detail/event-detail.twig' with {
196197
'show_admin_info': show_admin_info,
197198
'admin_info': admin_info,
198-
'image': card_media,
199+
'image': content.field_image|field_value,
199200
'start_date': {
200201
'month': event_start_date|date('M'),
201202
'day': event_start_date|date('j')

‎templates/content/node--event--large-card.html.twig‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@
8989
#}
9090
{% set multiyear_event = event_start_date|date('y')|number_format != event_end_date|date('y')|number_format %}
9191
{% set multiday_event = multiyear_event or event_start_date|date('z')|number_format < event_end_date|date('z')|number_format %}
92-
{% set all_day_event_text = content.field_smart_date[0]["end"] is null ? content.field_smart_date[0]["start"]["#text"]["time"] : FALSE %}
92+
{% if content.field_smart_date[0]["end"] is null %}
93+
{% set all_day_event_text = content.field_smart_date[0]["start"]["#text"]["time"] %}
94+
{% elseif content.field_smart_date[0]["end"]["#text"]["time"]["#format"] is null %}
95+
{% set all_day_event_text = content.field_smart_date[0]["end"]["#text"]["time"] %}
96+
{% else %}
97+
{% set all_day_event_text = FALSE %}
98+
{% endif %}
9399

94100
{#
95101
/**
@@ -99,15 +105,18 @@
99105
*/
100106
#}
101107
{% set datetime_composed %}
102-
{% if all_day_event_text %}
103-
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
104-
{% elseif multiday_event == false %}
105-
{{ event_start_date|date("l, F j, Y") }}
106-
·
107-
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
108-
{% else %}
109-
{{- event_start_date|date("l, F j, Y") }}&nbsp;&nbsp;–&nbsp;&nbsp;{{ event_end_date|date("l, F j, Y") }}
110-
{% endif %}
108+
{% if all_day_event_text and multiday_event == false %}
109+
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
110+
{% elseif multiday_event == true and all_day_event_text %}
111+
{{ event_start_date|date("l, F j, Y") }} – {{ event_end_date|date("l, F j, Y") }}
112+
{% elseif multiday_event == false %}
113+
{{ event_start_date|date("l, F j, Y") }}
114+
·
115+
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
116+
{% else %}
117+
{{ event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }} –
118+
{{ event_end_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) -}}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
119+
{% endif %}
111120
{% endset %}
112121

113122
{#
@@ -124,13 +133,13 @@
124133

125134
{% set is_past_event = node.isPastEvent() %}
126135

127-
{% set card_media %}
128-
{% if content.field_image|field_value is not empty %}
129-
{{ content.field_image|field_value }}
130-
{% elseif site_setting_entity_by_name('event_default_motif_image') %}
131-
{{ drupal_entity('media', site_setting_entity_by_name('event_default_motif_image').field_motif_image.target_id, 'large_image_only') }}
132-
{% endif %}
133-
{% endset %}
136+
{% if content.field_image|field_value is not empty %}
137+
{% set card_media = content.field_image|field_value %}
138+
{% elseif site_setting_entity_by_name('event_default_motif_image') %}
139+
{% set card_media = drupal_entity('media', site_setting_entity_by_name('event_default_motif_image').field_motif_image.target_id, 'card_image_only') %}
140+
{% else %}
141+
{% set card_media = FALSE %}
142+
{% endif %}
134143

135144
{#
136145
/**

‎templates/content/node--event--list-card.html.twig‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@
8989
#}
9090
{% set multiyear_event = event_start_date|date('y')|number_format != event_end_date|date('y')|number_format %}
9191
{% set multiday_event = multiyear_event or event_start_date|date('z')|number_format < event_end_date|date('z')|number_format %}
92-
{% set all_day_event_text = content.field_smart_date[0]["end"] is null ? content.field_smart_date[0]["start"]["#text"]["time"] : FALSE %}
92+
{% if content.field_smart_date[0]["end"] is null %}
93+
{% set all_day_event_text = content.field_smart_date[0]["start"]["#text"]["time"] %}
94+
{% elseif content.field_smart_date[0]["end"]["#text"]["time"]["#format"] is null %}
95+
{% set all_day_event_text = content.field_smart_date[0]["end"]["#text"]["time"] %}
96+
{% else %}
97+
{% set all_day_event_text = FALSE %}
98+
{% endif %}
9399

94100
{#
95101
/**
@@ -100,15 +106,18 @@
100106
#}
101107

102108
{% set datetime_composed %}
103-
{% if all_day_event_text %}
104-
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
105-
{% elseif multiday_event == false %}
106-
{{ event_start_date|date("l, F j, Y") }}
107-
·
108-
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
109-
{% else %}
110-
{{- event_start_date|date("l, F j, Y") }}&nbsp;&nbsp;–&nbsp;&nbsp;{{ event_end_date|date("l, F j, Y") }}
111-
{% endif %}
109+
{% if all_day_event_text and multiday_event == false %}
110+
{{- event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ all_day_event_text }}
111+
{% elseif multiday_event == true and all_day_event_text %}
112+
{{ event_start_date|date("l, F j, Y") }} – {{ event_end_date|date("l, F j, Y") }}
113+
{% elseif multiday_event == false %}
114+
{{ event_start_date|date("l, F j, Y") }}
115+
·
116+
{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}–{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
117+
{% else %}
118+
{{ event_start_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_start_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) }} –
119+
{{ event_end_date|date("l, F j, Y") }}&nbsp;·&nbsp;{{ event_end_date|date("g:i a")|replace({"am":"a.m.", "pm":"p.m."}) -}}&nbsp;&nbsp;{{ event_start_date|date("T")|replace({"PST":"PT","PDT":"PT"}) -}}
120+
{% endif %}
112121
{% endset %}
113122

114123
{#
@@ -125,6 +134,14 @@
125134

126135
{% set is_past_event = node.isPastEvent() %}
127136

137+
{% if content.field_image|field_value is not empty %}
138+
{% set card_media = content.field_image|field_value %}
139+
{% elseif site_setting_entity_by_name('event_default_motif_image') %}
140+
{% set card_media = drupal_entity('media', site_setting_entity_by_name('event_default_motif_image').field_motif_image.target_id, 'card_image_only') %}
141+
{% else %}
142+
{% set card_media = FALSE %}
143+
{% endif %}
144+
128145
{#
129146
/**
130147
* If the "Is external event?" field (field_boolean_2) is set then use the URL of the external link
@@ -150,6 +167,7 @@
150167
'event_date': datetime_composed,
151168
'is_virtual': virtual_event,
152169
'event_location': location,
170+
'media': card_media,
153171
} %}
154172

155173
{% set catch_cache = content|render %}

0 commit comments

Comments
 (0)