Skip to content

Commit 33c69c4

Browse files
authored
Merge pull request #958 from dof-dss/development
Merge dev to main for release
2 parents f62809c + 7c5d51e commit 33c69c4

File tree

2 files changed

+123
-55
lines changed

2 files changed

+123
-55
lines changed

composer.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/sync/core.entity_view_display.node.landing_page.full.yml

+117-49
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ third_party_settings:
3939
- 'Custom block types'
4040
- 'Custom blocks'
4141
- Devel
42+
- 'EU Cookie Compliance'
4243
- Facets
4344
- 'Facets summary (Experimental)'
4445
- Forms
@@ -128,7 +129,8 @@ third_party_settings:
128129
Views: { }
129130
'Webform access': { }
130131
core: { }
131-
restricted_categories: { }
132+
restricted_categories:
133+
- 'EU Cookie Compliance'
132134
whitelisted_blocks:
133135
Block: { }
134136
'Chaos Tools': { }
@@ -196,43 +198,42 @@ third_party_settings:
196198
- teasers_x3
197199
- teasers_x2
198200
allowlisted_blocks:
201+
layout_onecol:
202+
all_regions:
203+
'Custom block types':
204+
- accordion_menu
205+
- article_teasers_by_topic
206+
- banner_deep
207+
- card_contact
208+
- card_deck_plain
209+
- information_notice
210+
- text
211+
- video_and_caption
212+
'Inline blocks':
213+
- 'inline_block:accordion_menu'
214+
- 'inline_block:article_teasers_by_topic'
215+
- 'inline_block:banner_deep'
216+
- 'inline_block:card_contact'
217+
- 'inline_block:information_notice'
218+
- 'inline_block:card_deck_plain'
219+
- 'inline_block:text'
220+
- 'inline_block:video_and_caption'
199221
teasers_x2:
200222
all_regions:
201-
'Chaos Tools': { }
202-
'Content fields': { }
203223
'Custom block types':
204224
- card_contact
205225
- card_nested_wide
206226
- card_wide
227+
- information_notice
228+
- text
207229
- video
208-
'Custom blocks': { }
209-
Devel: { }
210-
Facets: { }
211-
'Facets summary (Experimental)': { }
212-
Forms: { }
213-
Geolocation: { }
214-
Help: { }
215230
'Inline blocks':
216231
- 'inline_block:card_contact'
217232
- 'inline_block:card_wide'
218233
- 'inline_block:card_nested_wide'
234+
- 'inline_block:information_notice'
235+
- 'inline_block:text'
219236
- 'inline_block:video'
220-
'Lists (Views)': { }
221-
Menus: { }
222-
'NI Direct': { }
223-
'NIDirect Contacts': { }
224-
'NIDirect Health Conditions': { }
225-
'NIDirect Homepage': { }
226-
'NIDirect News': { }
227-
'Origins: Social Sharing': { }
228-
'Site Themes (Views)': { }
229-
System: { }
230-
'Translation help link': { }
231-
User: { }
232-
Views: { }
233-
Webform: { }
234-
'Webform access': { }
235-
core: { }
236237
teasers_x3:
237238
all_regions:
238239
'Chaos Tools': { }
@@ -243,33 +244,100 @@ third_party_settings:
243244
- card_standard
244245
'Custom blocks': { }
245246
Devel: { }
246-
Facets: { }
247-
'Facets summary (Experimental)': { }
248-
Forms: { }
249-
Geolocation: { }
250-
Help: { }
251247
'Inline blocks':
252248
- 'inline_block:card_contact'
253249
- 'inline_block:card_standard'
254250
- 'inline_block:card_nested_standard'
255-
'Lists (Views)': { }
256-
Menus: { }
257-
'NI Direct': { }
258-
NIDirect: { }
259-
'NIDirect Common': { }
260-
'NIDirect Contacts': { }
261-
'NIDirect Health Conditions': { }
262-
'NIDirect Homepage': { }
263-
'NIDirect News': { }
264-
'Origins: Social Sharing': { }
265-
'Site Themes (Views)': { }
266-
System: { }
267-
'Translation help link': { }
268-
User: { }
269-
Views: { }
270-
Webform: { }
271-
'Webform access': { }
272-
core: { }
251+
restricted_categories:
252+
layout_onecol:
253+
all_regions:
254+
- 'Chaos Tools'
255+
- 'Content fields'
256+
- 'Custom blocks'
257+
- Devel
258+
- 'EU Cookie Compliance'
259+
- Facets
260+
- 'Facets summary (Experimental)'
261+
- Forms
262+
- Geolocation
263+
- Help
264+
- 'Landing pages'
265+
- 'Lists (Views)'
266+
- Menus
267+
- 'NI Direct'
268+
- NIDirect
269+
- 'NIDirect Common'
270+
- 'NIDirect Contacts'
271+
- 'NIDirect Health Conditions'
272+
- 'NIDirect Homepage'
273+
- 'NIDirect News'
274+
- 'Origins: Social Sharing'
275+
- 'Site Themes (Views)'
276+
- System
277+
- 'Translation help link'
278+
- User
279+
- Views
280+
- Webform
281+
- 'Webform access'
282+
- core
283+
teasers_x3:
284+
all_regions:
285+
- 'EU Cookie Compliance'
286+
- Facets
287+
- 'Facets summary (Experimental)'
288+
- Forms
289+
- Geolocation
290+
- Help
291+
- 'Landing pages'
292+
- 'Lists (Views)'
293+
- Menus
294+
- 'NI Direct'
295+
- NIDirect
296+
- 'NIDirect Common'
297+
- 'NIDirect Contacts'
298+
- 'NIDirect Health Conditions'
299+
- 'NIDirect Homepage'
300+
- 'NIDirect News'
301+
- 'Origins: Social Sharing'
302+
- 'Site Themes (Views)'
303+
- System
304+
- 'Translation help link'
305+
- User
306+
- Views
307+
- Webform
308+
- 'Webform access'
309+
- core
310+
teasers_x2:
311+
all_regions:
312+
- 'Chaos Tools'
313+
- 'Content fields'
314+
- 'Custom blocks'
315+
- Devel
316+
- 'EU Cookie Compliance'
317+
- Facets
318+
- 'Facets summary (Experimental)'
319+
- Forms
320+
- Geolocation
321+
- Help
322+
- 'Landing pages'
323+
- 'Lists (Views)'
324+
- Menus
325+
- 'NI Direct'
326+
- NIDirect
327+
- 'NIDirect Common'
328+
- 'NIDirect Contacts'
329+
- 'NIDirect Health Conditions'
330+
- 'NIDirect Homepage'
331+
- 'NIDirect News'
332+
- 'Origins: Social Sharing'
333+
- 'Site Themes (Views)'
334+
- System
335+
- 'Translation help link'
336+
- User
337+
- Views
338+
- Webform
339+
- 'Webform access'
340+
- core
273341
whitelisted_blocks:
274342
layout_onecol:
275343
all_regions:

0 commit comments

Comments
 (0)