Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
johangant committed Jul 29, 2020
2 parents 65da4fe + 4b59fea commit 2f84890
Show file tree
Hide file tree
Showing 66 changed files with 1,690 additions and 381 deletions.
293 changes: 137 additions & 156 deletions .circleci/config.yml

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"require": {
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"dof-dss/nicsdru_nidirect_theme": "^0.4.0",
"dof-dss/nicsdru_origins_modules": "^0.6.0",
"dof-dss/nicsdru_nidirect_theme": "^0.4.1",
"dof-dss/nicsdru_origins_modules": "^0.6.1",
"dof-dss/nicsdru_origins_theme": "^0.3",
"dof-dss/nidirect-d8-test-install-profile": "^0.2.0",
"dof-dss/nidirect-migrations": "^1.1",
"dof-dss/nidirect-site-modules": "^0.5.0",
"dof-dss/nidirect-migrations": "^1.2",
"dof-dss/nidirect-site-modules": "^0.5.1",
"drupal/address": "^1.7",
"drupal/admin_toolbar": "^2.0",
"drupal/adminimal_theme": "^1.5",
Expand Down Expand Up @@ -177,6 +177,9 @@
},
"drupal/password_policy": {
"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"
},
"drupal/paragraphs": {
"Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2020-06-25/paragraphs-2901390-51.patch"
}
},
"composer-exit-on-patch-failure": true,
Expand Down
45 changes: 24 additions & 21 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ visibility:
bundles:
application: application
article: article
landing_page: landing_page
news: news
page: page
negate: false
context_mapping:
node: '@node.node_route_context:node'
8 changes: 4 additions & 4 deletions config/sync/block_blacklist.settings.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
system_match: "system_powered_by_block\r\n"
system_match: system_powered_by_block
system_prefix: ''
system_regex: ''
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"
layout_prefix: "system_menu_block\r\nextra_field_block:user\r\nfield_block:user"
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"
layout_match: ''
layout_prefix: ''
layout_regex: ''
_core:
default_config_hash: S6rQarWvkmKD23_sdFs_HQdHZbyd6KX58eINnvUL9n4
8 changes: 8 additions & 0 deletions config/sync/block_content.type.accordion_menu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uuid: 69a14b88-b305-4621-9a37-abc22889760f
langcode: en
status: true
dependencies: { }
id: accordion_menu
label: 'Accordion menu'
revision: 1
description: ''
8 changes: 8 additions & 0 deletions config/sync/block_content.type.banner_deep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uuid: 95472ed2-1b38-4f34-98b1-8e4b47aa630d
langcode: en
status: true
dependencies: { }
id: banner_deep
label: 'Banner deep'
revision: 1
description: 'Block for displaying a deep banner image on landing page layouts.'
8 changes: 8 additions & 0 deletions config/sync/block_content.type.card_standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uuid: 5dd915b1-a9e4-4312-bd60-c7bd21d8da9f
langcode: en
status: true
dependencies: { }
id: card_standard
label: 'Card - standard'
revision: 1
description: ''
8 changes: 8 additions & 0 deletions config/sync/block_content.type.card_wide.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uuid: 54805db5-6c1f-4b45-8f19-974229a8df40
langcode: en
status: true
dependencies: { }
id: card_wide
label: 'Card - wide'
revision: 1
description: ''
8 changes: 8 additions & 0 deletions config/sync/block_content.type.video_and_caption.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uuid: 4f8e071f-45a1-4b9f-9246-2e2eb988dd0c
langcode: en
status: true
dependencies: { }
id: video_and_caption
label: 'Video and caption'
revision: 1
description: ''
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
uuid: 99136b5a-8bc9-4b71-afd6-c19a34b96f21
langcode: en
status: true
dependencies:
config:
- block_content.type.accordion_menu
- field.field.block_content.accordion_menu.field_accordion_sections
module:
- paragraphs
id: block_content.accordion_menu.default
targetEntityType: block_content
bundle: accordion_menu
mode: default
content:
field_accordion_sections:
type: entity_reference_paragraphs
weight: 1
settings:
title: Paragraph
title_plural: Paragraphs
edit_mode: closed
add_mode: button
form_display_mode: default
default_paragraph_type: accordion_section
third_party_settings: { }
region: content
langcode:
type: language_select
weight: 2
region: content
settings:
include_locked: true
third_party_settings: { }
hidden:
info: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
uuid: 2f27c1f1-2479-4141-806a-321cdb72d8d6
langcode: en
status: true
dependencies:
config:
- block_content.type.banner_deep
- field.field.block_content.banner_deep.body
- field.field.block_content.banner_deep.field_banner_image
- field.field.block_content.banner_deep.field_banner_image_overlay
module:
- media_library
id: block_content.banner_deep.default
targetEntityType: block_content
bundle: banner_deep
mode: default
content:
field_banner_image:
type: media_library_widget
weight: 0
settings:
media_types: { }
third_party_settings: { }
region: content
field_banner_image_overlay:
type: media_library_widget
weight: 1
settings:
media_types: { }
third_party_settings: { }
region: content
hidden:
body: true
info: true
langcode: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
uuid: a8c997a2-eb81-4ddb-be9d-20ebbb248151
langcode: en
status: true
dependencies:
config:
- block_content.type.card_standard
- field.field.block_content.card_standard.body
- field.field.block_content.card_standard.field_image
- field.field.block_content.card_standard.field_link
- field.field.block_content.card_standard.field_teaser
module:
- link
- media_library
id: block_content.card_standard.default
targetEntityType: block_content
bundle: card_standard
mode: default
content:
field_image:
type: media_library_widget
weight: 0
settings:
media_types: { }
third_party_settings: { }
region: content
field_link:
weight: 2
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
type: link_default
region: content
field_teaser:
weight: 1
settings:
size: 60
placeholder: ''
third_party_settings: { }
type: string_textfield
region: content
hidden:
body: true
info: true
langcode: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
uuid: 1c388918-dc25-4882-be7f-62f52df880db
langcode: en
status: true
dependencies:
config:
- block_content.type.card_wide
- field.field.block_content.card_wide.body
- field.field.block_content.card_wide.field_image
- field.field.block_content.card_wide.field_link
- field.field.block_content.card_wide.field_teaser
module:
- link
- media_library
id: block_content.card_wide.default
targetEntityType: block_content
bundle: card_wide
mode: default
content:
field_image:
weight: 0
settings:
media_types: { }
third_party_settings: { }
type: media_library_widget
region: content
field_link:
weight: 2
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
type: link_default
region: content
field_teaser:
weight: 1
settings:
size: 60
placeholder: ''
third_party_settings: { }
type: string_textfield
region: content
hidden:
body: true
info: true
langcode: true
Loading

0 comments on commit 2f84890

Please sign in to comment.