Skip to content

Commit 2f84890

Browse files
johangantjohangant
committed
Merge branch 'development'
2 parents 65da4fe + 4b59fea commit 2f84890

File tree

66 files changed

+1690
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1690
-381
lines changed

‎.circleci/config.yml

+137-156
Large diffs are not rendered by default.

‎composer.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
"require": {
3333
"composer/installers": "^1.2",
3434
"cweagans/composer-patches": "^1.6.5",
35-
"dof-dss/nicsdru_nidirect_theme": "^0.4.0",
36-
"dof-dss/nicsdru_origins_modules": "^0.6.0",
35+
"dof-dss/nicsdru_nidirect_theme": "^0.4.1",
36+
"dof-dss/nicsdru_origins_modules": "^0.6.1",
3737
"dof-dss/nicsdru_origins_theme": "^0.3",
3838
"dof-dss/nidirect-d8-test-install-profile": "^0.2.0",
39-
"dof-dss/nidirect-migrations": "^1.1",
40-
"dof-dss/nidirect-site-modules": "^0.5.0",
39+
"dof-dss/nidirect-migrations": "^1.2",
40+
"dof-dss/nidirect-site-modules": "^0.5.1",
4141
"drupal/address": "^1.7",
4242
"drupal/admin_toolbar": "^2.0",
4343
"drupal/adminimal_theme": "^1.5",
@@ -177,6 +177,9 @@
177177
},
178178
"drupal/password_policy": {
179179
"field_last_password_reset is unknown while importing configuration on site without password_policy activated": "https://www.drupal.org/files/issues/2020-01-17/password_policy-n2771129-109.patch"
180+
},
181+
"drupal/paragraphs": {
182+
"Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2020-06-25/paragraphs-2901390-51.patch"
180183
}
181184
},
182185
"composer-exit-on-patch-failure": true,

‎composer.lock

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

‎config/sync/block.block.views_block__related_content_content_by_theme.yml

-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ visibility:
2929
bundles:
3030
application: application
3131
article: article
32-
landing_page: landing_page
33-
news: news
34-
page: page
3532
negate: false
3633
context_mapping:
3734
node: '@node.node_route_context:node'

‎config/sync/block_blacklist.settings.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
system_match: "system_powered_by_block\r\n"
1+
system_match: system_powered_by_block
22
system_prefix: ''
33
system_regex: ''
4-
layout_match: "devel_switch_user\r\nentity_view:user\r\nentity_view:webform_submission\r\nuser_login_block\r\nbroken\r\nshortcuts\r\nsystem_messages_block\r\nviews_block:who_s_new-block_1\r\nviews_block:who_s_online-who_s_online_block\r\nlocal_actions_block\r\nlocal_tasks_block"
5-
layout_prefix: "system_menu_block\r\nextra_field_block:user\r\nfield_block:user"
6-
layout_regex: "/\\S+default_langcode|vid|field_meta_tags|field_next_audit_due|field_toc_enable$/m\r\n/\\S+revision_\\S+$/m\r\n"
4+
layout_match: ''
5+
layout_prefix: ''
6+
layout_regex: ''
77
_core:
88
default_config_hash: S6rQarWvkmKD23_sdFs_HQdHZbyd6KX58eINnvUL9n4

‎config/sync/block_content.type.accordion_menu.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 69a14b88-b305-4621-9a37-abc22889760f
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: accordion_menu
6+
label: 'Accordion menu'
7+
revision: 1
8+
description: ''

‎config/sync/block_content.type.banner_deep.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 95472ed2-1b38-4f34-98b1-8e4b47aa630d
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: banner_deep
6+
label: 'Banner deep'
7+
revision: 1
8+
description: 'Block for displaying a deep banner image on landing page layouts.'

‎config/sync/block_content.type.card_standard.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 5dd915b1-a9e4-4312-bd60-c7bd21d8da9f
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: card_standard
6+
label: 'Card - standard'
7+
revision: 1
8+
description: ''

‎config/sync/block_content.type.card_wide.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 54805db5-6c1f-4b45-8f19-974229a8df40
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: card_wide
6+
label: 'Card - wide'
7+
revision: 1
8+
description: ''

‎config/sync/block_content.type.video_and_caption.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 4f8e071f-45a1-4b9f-9246-2e2eb988dd0c
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: video_and_caption
6+
label: 'Video and caption'
7+
revision: 1
8+
description: ''

‎config/sync/core.entity_form_display.block_content.accordion_menu.default.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
uuid: 99136b5a-8bc9-4b71-afd6-c19a34b96f21
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- block_content.type.accordion_menu
7+
- field.field.block_content.accordion_menu.field_accordion_sections
8+
module:
9+
- paragraphs
10+
id: block_content.accordion_menu.default
11+
targetEntityType: block_content
12+
bundle: accordion_menu
13+
mode: default
14+
content:
15+
field_accordion_sections:
16+
type: entity_reference_paragraphs
17+
weight: 1
18+
settings:
19+
title: Paragraph
20+
title_plural: Paragraphs
21+
edit_mode: closed
22+
add_mode: button
23+
form_display_mode: default
24+
default_paragraph_type: accordion_section
25+
third_party_settings: { }
26+
region: content
27+
langcode:
28+
type: language_select
29+
weight: 2
30+
region: content
31+
settings:
32+
include_locked: true
33+
third_party_settings: { }
34+
hidden:
35+
info: true

‎config/sync/core.entity_form_display.block_content.banner_deep.default.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
uuid: 2f27c1f1-2479-4141-806a-321cdb72d8d6
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- block_content.type.banner_deep
7+
- field.field.block_content.banner_deep.body
8+
- field.field.block_content.banner_deep.field_banner_image
9+
- field.field.block_content.banner_deep.field_banner_image_overlay
10+
module:
11+
- media_library
12+
id: block_content.banner_deep.default
13+
targetEntityType: block_content
14+
bundle: banner_deep
15+
mode: default
16+
content:
17+
field_banner_image:
18+
type: media_library_widget
19+
weight: 0
20+
settings:
21+
media_types: { }
22+
third_party_settings: { }
23+
region: content
24+
field_banner_image_overlay:
25+
type: media_library_widget
26+
weight: 1
27+
settings:
28+
media_types: { }
29+
third_party_settings: { }
30+
region: content
31+
hidden:
32+
body: true
33+
info: true
34+
langcode: true

‎config/sync/core.entity_form_display.block_content.card_standard.default.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
uuid: a8c997a2-eb81-4ddb-be9d-20ebbb248151
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- block_content.type.card_standard
7+
- field.field.block_content.card_standard.body
8+
- field.field.block_content.card_standard.field_image
9+
- field.field.block_content.card_standard.field_link
10+
- field.field.block_content.card_standard.field_teaser
11+
module:
12+
- link
13+
- media_library
14+
id: block_content.card_standard.default
15+
targetEntityType: block_content
16+
bundle: card_standard
17+
mode: default
18+
content:
19+
field_image:
20+
type: media_library_widget
21+
weight: 0
22+
settings:
23+
media_types: { }
24+
third_party_settings: { }
25+
region: content
26+
field_link:
27+
weight: 2
28+
settings:
29+
placeholder_url: ''
30+
placeholder_title: ''
31+
third_party_settings: { }
32+
type: link_default
33+
region: content
34+
field_teaser:
35+
weight: 1
36+
settings:
37+
size: 60
38+
placeholder: ''
39+
third_party_settings: { }
40+
type: string_textfield
41+
region: content
42+
hidden:
43+
body: true
44+
info: true
45+
langcode: true

‎config/sync/core.entity_form_display.block_content.card_wide.default.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
uuid: 1c388918-dc25-4882-be7f-62f52df880db
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- block_content.type.card_wide
7+
- field.field.block_content.card_wide.body
8+
- field.field.block_content.card_wide.field_image
9+
- field.field.block_content.card_wide.field_link
10+
- field.field.block_content.card_wide.field_teaser
11+
module:
12+
- link
13+
- media_library
14+
id: block_content.card_wide.default
15+
targetEntityType: block_content
16+
bundle: card_wide
17+
mode: default
18+
content:
19+
field_image:
20+
weight: 0
21+
settings:
22+
media_types: { }
23+
third_party_settings: { }
24+
type: media_library_widget
25+
region: content
26+
field_link:
27+
weight: 2
28+
settings:
29+
placeholder_url: ''
30+
placeholder_title: ''
31+
third_party_settings: { }
32+
type: link_default
33+
region: content
34+
field_teaser:
35+
weight: 1
36+
settings:
37+
size: 60
38+
placeholder: ''
39+
third_party_settings: { }
40+
type: string_textfield
41+
region: content
42+
hidden:
43+
body: true
44+
info: true
45+
langcode: true

0 commit comments

Comments
 (0)