updated core to 8.6.1 via composer

2018-09-12 13:58:26 +02:00
parent a9a219f2ed
commit ea56b9fba3
4443 changed files with 112098 additions and 40708 deletions
@@ -17,4 +17,3 @@ settings:
  provider: help
  label_display: '0'
 visibility: {  }
-
@@ -9,8 +9,8 @@ dependencies:
    - umami
 id: umami_account_menu
 theme: umami
-region: header
-weight: -4
+region: pre_header
+weight: -6
 provider: null
 plugin: 'system_menu_block:account'
 settings:
@@ -8,7 +8,7 @@ dependencies:
 id: umami_branding
 theme: umami
 region: header
-weight: -8
+weight: -7
 provider: null
 plugin: system_branding_block
 settings:
@@ -10,7 +10,7 @@ dependencies:
 id: umami_main_menu
 theme: umami
 region: header
-weight: -8
+weight: -6
 provider: null
 plugin: 'system_menu_block:main'
 settings:
@@ -7,8 +7,8 @@ dependencies:
    - umami
 id: umami_search
 theme: umami
-region: header
-weight: -6
+region: pre_header
+weight: -7
 provider: null
 plugin: search_form_block
 settings:
@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.recipe_collections
+  module:
+    - views
+  theme:
+    - umami
+id: views_block__recipe_collections_block
+theme: umami
+region: content_bottom
+weight: 0
+provider: null
+plugin: 'views_block:recipe_collections-block'
+settings:
+  id: 'views_block:recipe_collections-block'
+  label: ''
+  provider: views
+  label_display: visible
+  views_label: ''
+  items_per_page: none
+visibility: {  }
@@ -56,4 +56,5 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  moderation_state: true
@@ -28,4 +28,5 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  moderation_state: true
@@ -36,4 +36,5 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  moderation_state: true
@@ -56,4 +56,5 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  moderation_state: true
@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.audio.field_media_audio_file
+    - media.type.audio
+  module:
+    - file
+    - path
+id: media.audio.default
+targetEntityType: media
+bundle: audio
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_audio_file:
+    weight: 0
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+    type: file_generic
+    region: content
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 100
+    region: content
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: {  }
+hidden:
+  moderation_state: true
@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.file.field_media_file
+    - media.type.file
+  module:
+    - file
+    - path
+id: media.file.default
+targetEntityType: media
+bundle: file
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_file:
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+    type: file_generic
+    weight: 0
+    region: content
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 100
+    region: content
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: {  }
+hidden:
+  moderation_state: true
@@ -0,0 +1,61 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.image.field_media_image
+    - image.style.thumbnail
+    - media.type.image
+  module:
+    - image
+    - path
+id: media.image.default
+targetEntityType: media
+bundle: image
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_image:
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+    type: image_image
+    weight: 0
+    region: content
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 100
+    region: content
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: {  }
+hidden:
+  moderation_state: true
@@ -0,0 +1,53 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.remote_video.field_media_oembed_video
+    - media.type.remote_video
+  module:
+    - media
+    - path
+id: media.remote_video.default
+targetEntityType: media
+bundle: remote_video
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_oembed_video:
+    type: oembed_textfield
+    weight: 0
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 100
+    region: content
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 4
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: {  }
+hidden:
+  moderation_state: true
+  name: true
@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.video.field_media_video_file
+    - media.type.video
+  module:
+    - file
+    - path
+id: media.video.default
+targetEntityType: media
+bundle: video
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_video_file:
+    weight: 0
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+    type: file_generic
+    region: content
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 100
+    region: content
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    region: content
+    third_party_settings: {  }
+hidden:
+  moderation_state: true
@@ -8,6 +8,7 @@ dependencies:
    - image.style.thumbnail
    - node.type.article
  module:
+    - content_moderation
    - image
    - path
    - text
@@ -27,13 +28,13 @@ content:
    third_party_settings: {  }
  created:
    type: datetime_timestamp
-    weight: 10
+    weight: 5
    region: content
    settings: {  }
    third_party_settings: {  }
  field_image:
    type: image_image
-    weight: 4
+    weight: 3
    region: content
    settings:
      progress_indicator: throbber
@@ -41,13 +42,22 @@ content:
    third_party_settings: {  }
  field_tags:
    type: entity_reference_autocomplete_tags
-    weight: 3
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 10
    region: content
    settings: {  }
    third_party_settings: {  }
  path:
    type: path
-    weight: 30
+    weight: 8
    region: content
    settings: {  }
    third_party_settings: {  }
@@ -55,21 +65,21 @@ content:
    type: boolean_checkbox
    settings:
      display_label: true
-    weight: 15
+    weight: 6
    region: content
    third_party_settings: {  }
  status:
    type: boolean_checkbox
    settings:
      display_label: true
-    weight: 120
+    weight: 9
    region: content
    third_party_settings: {  }
  sticky:
    type: boolean_checkbox
    settings:
      display_label: true
-    weight: 16
+    weight: 7
    region: content
    third_party_settings: {  }
  title:
@@ -82,7 +92,7 @@ content:
    third_party_settings: {  }
  uid:
    type: entity_reference_autocomplete
-    weight: 5
+    weight: 4
    region: content
    settings:
      match_operator: CONTAINS
@@ -5,6 +5,7 @@ dependencies:
    - field.field.node.page.body
    - node.type.page
  module:
+    - content_moderation
    - path
    - text
 id: node.page.default
@@ -14,7 +15,7 @@ mode: default
 content:
  body:
    type: text_textarea_with_summary
-    weight: 31
+    weight: 6
    region: content
    settings:
      rows: 9
@@ -23,13 +24,19 @@ content:
    third_party_settings: {  }
  created:
    type: datetime_timestamp
-    weight: 10
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 8
    region: content
    settings: {  }
    third_party_settings: {  }
  path:
    type: path
-    weight: 30
+    weight: 5
    region: content
    settings: {  }
    third_party_settings: {  }
@@ -37,26 +44,26 @@ content:
    type: boolean_checkbox
    settings:
      display_label: true
-    weight: 15
+    weight: 3
    region: content
    third_party_settings: {  }
  status:
    type: boolean_checkbox
    settings:
      display_label: true
-    weight: 120
+    weight: 7
    region: content
    third_party_settings: {  }
  sticky:
    type: boolean_checkbox
    settings:
      display_label: true
-    weight: 16
+    weight: 4
    region: content
    third_party_settings: {  }
  title:
    type: string_textfield
-    weight: -5
+    weight: 0
    region: content
    settings:
      size: 60
@@ -64,7 +71,7 @@ content:
    third_party_settings: {  }
  uid:
    type: entity_reference_autocomplete
-    weight: 5
+    weight: 1
    region: content
    settings:
      match_operator: CONTAINS
@@ -16,6 +16,7 @@ dependencies:
    - image.style.thumbnail
    - node.type.recipe
  module:
+    - content_moderation
    - image
    - path
    - text
@@ -89,7 +90,7 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: entity_reference_autocomplete_tags
    region: content
  field_recipe_instruction:
    weight: 11
@@ -114,8 +115,14 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: entity_reference_autocomplete_tags
    region: content
+  moderation_state:
+    type: moderation_state_default
+    weight: 18
+    region: content
+    settings: {  }
+    third_party_settings: {  }
  path:
    type: path
    weight: 16
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.audio.field_media_audio_file
+    - media.type.audio
+  module:
+    - file
+id: media.audio.default
+targetEntityType: media
+bundle: audio
+mode: default
+content:
+  field_media_audio_file:
+    type: file_audio
+    weight: 0
+    label: visually_hidden
+    settings:
+      controls: true
+      autoplay: false
+      loop: false
+      multiple_file_display_type: tags
+    third_party_settings: {  }
+    region: content
+hidden:
+  created: true
+  name: true
+  thumbnail: true
+  uid: true
@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.file.field_media_file
+    - media.type.file
+  module:
+    - file
+id: media.file.default
+targetEntityType: media
+bundle: file
+mode: default
+content:
+  field_media_file:
+    label: visually_hidden
+    settings: {  }
+    third_party_settings: {  }
+    type: file_default
+    weight: 1
+    region: content
+hidden:
+  created: true
+  name: true
+  thumbnail: true
+  uid: true
@@ -0,0 +1,27 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.image.field_media_image
+    - media.type.image
+  module:
+    - image
+id: media.image.default
+targetEntityType: media
+bundle: image
+mode: default
+content:
+  field_media_image:
+    label: visually_hidden
+    settings:
+      image_style: ''
+      image_link: file
+    third_party_settings: {  }
+    type: image
+    weight: 1
+    region: content
+hidden:
+  created: true
+  name: true
+  thumbnail: true
+  uid: true
@@ -0,0 +1,27 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.remote_video.field_media_oembed_video
+    - media.type.remote_video
+  module:
+    - media
+id: media.remote_video.default
+targetEntityType: media
+bundle: remote_video
+mode: default
+content:
+  field_media_oembed_video:
+    type: oembed
+    weight: 0
+    label: hidden
+    settings:
+      max_width: 0
+      max_height: 0
+    third_party_settings: {  }
+    region: content
+hidden:
+  created: true
+  name: true
+  thumbnail: true
+  uid: true
@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.video.field_media_video_file
+    - media.type.video
+  module:
+    - file
+id: media.video.default
+targetEntityType: media
+bundle: video
+mode: default
+content:
+  field_media_video_file:
+    type: file_video
+    weight: 0
+    label: visually_hidden
+    settings:
+      muted: false
+      width: 640
+      height: 480
+      controls: true
+      autoplay: false
+      loop: false
+      multiple_file_display_type: tags
+    third_party_settings: {  }
+    region: content
+hidden:
+  created: true
+  name: true
+  thumbnail: true
+  uid: true
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_top
+    - core.entity_view_mode.node.card
    - field.field.node.article.body
    - field.field.node.article.field_image
    - field.field.node.article.field_tags
@@ -11,10 +11,10 @@ dependencies:
  module:
    - responsive_image
    - user
-id: node.article.highlighted_top
+id: node.article.card
 targetEntityType: node
 bundle: article
-mode: highlighted_top
+mode: card
 content:
  field_image:
    type: responsive_image
@@ -22,10 +22,11 @@ content:
    region: content
    settings:
      responsive_image_style: 3_2_image
-      image_link: content
+      image_link: ''
    third_party_settings: {  }
    label: hidden
 hidden:
  body: true
+  content_moderation_control: true
  field_tags: true
  links: true
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_bottom
+    - core.entity_view_mode.node.card_common
    - field.field.node.article.body
    - field.field.node.article.field_image
    - field.field.node.article.field_tags
@@ -11,10 +11,10 @@ dependencies:
  module:
    - responsive_image
    - user
-id: node.article.highlighted_bottom
+id: node.article.card_common
 targetEntityType: node
 bundle: article
-mode: highlighted_bottom
+mode: card_common
 content:
  field_image:
    type: responsive_image
@@ -22,10 +22,11 @@ content:
    region: content
    settings:
      responsive_image_style: 3_2_image
-      image_link: content
+      image_link: ''
    third_party_settings: {  }
    label: hidden
 hidden:
  body: true
+  content_moderation_control: true
  field_tags: true
  links: true
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_medium
+    - core.entity_view_mode.node.card_common_alt
    - field.field.node.article.body
    - field.field.node.article.field_image
    - field.field.node.article.field_tags
@@ -11,10 +11,10 @@ dependencies:
  module:
    - responsive_image
    - user
-id: node.article.highlighted_medium
+id: node.article.card_common_alt
 targetEntityType: node
 bundle: article
-mode: highlighted_medium
+mode: card_common_alt
 content:
  field_image:
    type: responsive_image
@@ -22,10 +22,11 @@ content:
    region: content
    settings:
      responsive_image_style: square
-      image_link: content
+      image_link: ''
    third_party_settings: {  }
    label: hidden
 hidden:
  body: true
+  content_moderation_control: true
  field_tags: true
  links: true
@@ -45,4 +45,5 @@ content:
    region: content
    settings: {  }
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  content_moderation_control: true
@@ -37,7 +37,7 @@ content:
    type: entity_reference_label
    weight: 0
    region: content
-    label: above
+    label: inline
    settings:
      link: true
    third_party_settings: {  }
@@ -46,4 +46,5 @@ content:
    region: content
    settings: {  }
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  content_moderation_control: true
@@ -1,31 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.highlighted_small
-    - field.field.node.article.body
-    - field.field.node.article.field_image
-    - field.field.node.article.field_tags
-    - node.type.article
-    - responsive_image.styles.3_2_image
-  module:
-    - responsive_image
-    - user
-id: node.article.highlighted_small
-targetEntityType: node
-bundle: article
-mode: highlighted_small
-content:
-  field_image:
-    type: responsive_image
-    weight: 0
-    region: content
-    settings:
-      responsive_image_style: 3_2_image
-      image_link: content
-    third_party_settings: {  }
-    label: hidden
-hidden:
-  body: true
-  field_tags: true
-  links: true
@@ -19,5 +19,6 @@ content:
    region: content
 hidden:
  body: true
+  content_moderation_control: true
  field_image: true
  field_tags: true
@@ -47,4 +47,5 @@ content:
    region: content
    settings: {  }
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  content_moderation_control: true
@@ -22,4 +22,5 @@ content:
  links:
    weight: 101
    region: content
-hidden: {  }
+hidden:
+  content_moderation_control: true
@@ -24,4 +24,5 @@ content:
  links:
    weight: 101
    region: content
-hidden: {  }
+hidden:
+  content_moderation_control: true
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_small
+    - core.entity_view_mode.node.card
    - field.field.node.recipe.field_author
    - field.field.node.recipe.field_cooking_time
    - field.field.node.recipe.field_difficulty
@@ -20,33 +20,29 @@ dependencies:
    - options
    - responsive_image
    - user
-id: node.recipe.highlighted_small
+id: node.recipe.card
 targetEntityType: node
 bundle: recipe
-mode: highlighted_small
+mode: card
 content:
  field_difficulty:
-    weight: 1
-    label: above
+    weight: 0
+    label: inline
    settings: {  }
    third_party_settings: {  }
    type: list_default
    region: content
  field_image:
-    weight: 0
+    weight: 1
    label: hidden
    settings:
      responsive_image_style: 3_2_image
-      image_link: content
+      image_link: ''
    third_party_settings: {  }
    type: responsive_image
    region: content
-  links:
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
 hidden:
+  content_moderation_control: true
  field_author: true
  field_cooking_time: true
  field_ingredients: true
@@ -56,3 +52,4 @@ hidden:
  field_recipe_instruction: true
  field_summary: true
  field_tags: true
+  links: true
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_bottom
+    - core.entity_view_mode.node.card_common
    - field.field.node.recipe.field_author
    - field.field.node.recipe.field_cooking_time
    - field.field.node.recipe.field_difficulty
@@ -19,21 +19,22 @@ dependencies:
  module:
    - responsive_image
    - user
-id: node.recipe.highlighted_bottom
+id: node.recipe.card_common
 targetEntityType: node
 bundle: recipe
-mode: highlighted_bottom
+mode: card_common
 content:
  field_image:
+    type: responsive_image
    weight: 0
+    region: content
    label: hidden
    settings:
      responsive_image_style: 3_2_image
-      image_link: content
+      image_link: ''
    third_party_settings: {  }
-    type: responsive_image
-    region: content
 hidden:
+  content_moderation_control: true
  field_author: true
  field_cooking_time: true
  field_difficulty: true
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_top
+    - core.entity_view_mode.node.card_common_alt
    - field.field.node.recipe.field_author
    - field.field.node.recipe.field_cooking_time
    - field.field.node.recipe.field_difficulty
@@ -15,25 +15,26 @@ dependencies:
    - field.field.node.recipe.field_summary
    - field.field.node.recipe.field_tags
    - node.type.recipe
-    - responsive_image.styles.3_2_image
+    - responsive_image.styles.square
  module:
    - responsive_image
    - user
-id: node.recipe.highlighted_top
+id: node.recipe.card_common_alt
 targetEntityType: node
 bundle: recipe
-mode: highlighted_top
+mode: card_common_alt
 content:
  field_image:
    weight: 0
    label: hidden
    settings:
-      responsive_image_style: 3_2_image
-      image_link: content
+      responsive_image_style: square
+      image_link: ''
    third_party_settings: {  }
    type: responsive_image
    region: content
 hidden:
+  content_moderation_control: true
  field_author: true
  field_cooking_time: true
  field_difficulty: true
@@ -26,7 +26,7 @@ bundle: recipe
 mode: default
 content:
  field_cooking_time:
-    weight: 1
+    weight: 5
    label: above
    settings:
      thousand_separator: ''
@@ -35,7 +35,7 @@ content:
    type: number_integer
    region: content
  field_difficulty:
-    weight: 2
+    weight: 7
    label: above
    settings: {  }
    third_party_settings: {  }
@@ -51,7 +51,7 @@ content:
    type: responsive_image
    region: content
  field_ingredients:
-    weight: 4
+    weight: 8
    label: above
    settings:
      link_to_entity: false
@@ -59,15 +59,6 @@ content:
    type: string
    region: content
  field_number_of_servings:
-    weight: 5
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    type: number_integer
-    region: content
-  field_preparation_time:
    weight: 6
    label: above
    settings:
@@ -76,8 +67,17 @@ content:
    third_party_settings: {  }
    type: number_integer
    region: content
+  field_preparation_time:
+    weight: 4
+    label: above
+    settings:
+      thousand_separator: ''
+      prefix_suffix: true
+    third_party_settings: {  }
+    type: number_integer
+    region: content
  field_recipe_category:
-    weight: 7
+    weight: 1
    label: above
    settings:
      link: true
@@ -85,21 +85,21 @@ content:
    type: entity_reference_label
    region: content
  field_recipe_instruction:
-    weight: 8
+    weight: 9
    label: above
    settings: {  }
    third_party_settings: {  }
    type: text_default
    region: content
  field_summary:
-    weight: 9
+    weight: 0
    label: hidden
    settings: {  }
    third_party_settings: {  }
    type: text_default
    region: content
  field_tags:
-    weight: 10
+    weight: 2
    label: above
    settings:
      link: true
@@ -107,9 +107,10 @@ content:
    type: entity_reference_label
    region: content
  links:
-    weight: 0
+    weight: 10
    region: content
    settings: {  }
    third_party_settings: {  }
 hidden:
+  content_moderation_control: true
  field_author: true
@@ -27,8 +27,8 @@ bundle: recipe
 mode: full
 content:
  field_cooking_time:
-    weight: 1
-    label: above
+    weight: 5
+    label: inline
    settings:
      thousand_separator: ''
      prefix_suffix: true
@@ -36,8 +36,8 @@ content:
    type: number_integer
    region: content
  field_difficulty:
-    weight: 2
-    label: above
+    weight: 7
+    label: inline
    settings: {  }
    third_party_settings: {  }
    type: list_default
@@ -52,7 +52,7 @@ content:
    type: responsive_image
    region: content
  field_ingredients:
-    weight: 4
+    weight: 8
    label: above
    settings:
      link_to_entity: false
@@ -60,8 +60,8 @@ content:
    type: string
    region: content
  field_number_of_servings:
-    weight: 5
-    label: above
+    weight: 6
+    label: inline
    settings:
      thousand_separator: ''
      prefix_suffix: false
@@ -69,8 +69,8 @@ content:
    type: number_integer
    region: content
  field_preparation_time:
-    weight: 6
-    label: above
+    weight: 4
+    label: inline
    settings:
      thousand_separator: ''
      prefix_suffix: true
@@ -78,39 +78,36 @@ content:
    type: number_integer
    region: content
  field_recipe_category:
-    weight: 7
-    label: above
+    weight: 1
+    label: inline
    settings:
      link: true
    third_party_settings: {  }
    type: entity_reference_label
    region: content
  field_recipe_instruction:
-    weight: 8
+    weight: 9
    label: above
    settings: {  }
    third_party_settings: {  }
    type: text_default
    region: content
  field_summary:
-    weight: 9
+    weight: 0
    label: hidden
    settings: {  }
    third_party_settings: {  }
    type: text_default
    region: content
  field_tags:
-    weight: 10
-    label: above
+    weight: 2
+    label: inline
    settings:
      link: true
    third_party_settings: {  }
    type: entity_reference_label
    region: content
-  links:
-    weight: 0
-    region: content
-    settings: {  }
-    third_party_settings: {  }
 hidden:
+  content_moderation_control: true
  field_author: true
+  links: true
@@ -1,58 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.highlighted_medium
-    - field.field.node.recipe.field_author
-    - field.field.node.recipe.field_cooking_time
-    - field.field.node.recipe.field_difficulty
-    - field.field.node.recipe.field_image
-    - field.field.node.recipe.field_ingredients
-    - field.field.node.recipe.field_number_of_servings
-    - field.field.node.recipe.field_preparation_time
-    - field.field.node.recipe.field_recipe_category
-    - field.field.node.recipe.field_recipe_instruction
-    - field.field.node.recipe.field_summary
-    - field.field.node.recipe.field_tags
-    - node.type.recipe
-    - responsive_image.styles.square
-  module:
-    - options
-    - responsive_image
-    - user
-id: node.recipe.highlighted_medium
-targetEntityType: node
-bundle: recipe
-mode: highlighted_medium
-content:
-  field_difficulty:
-    weight: 1
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_image:
-    weight: 0
-    label: hidden
-    settings:
-      responsive_image_style: square
-      image_link: content
-    third_party_settings: {  }
-    type: responsive_image
-    region: content
-  links:
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  field_author: true
-  field_cooking_time: true
-  field_ingredients: true
-  field_number_of_servings: true
-  field_preparation_time: true
-  field_recipe_category: true
-  field_recipe_instruction: true
-  field_summary: true
-  field_tags: true
@@ -26,6 +26,7 @@ content:
    weight: 100
    region: content
 hidden:
+  content_moderation_control: true
  field_author: true
  field_cooking_time: true
  field_difficulty: true
@@ -3,7 +3,7 @@ status: true
 dependencies:
  module:
    - node
-id: node.highlighted_top
-label: 'Highlighted Top'
+id: node.card
+label: Card
 targetEntityType: node
 cache: true
@@ -3,7 +3,7 @@ status: true
 dependencies:
  module:
    - node
-id: node.highlighted_small
-label: 'Highlighted Small'
+id: node.card_common
+label: 'Card common'
 targetEntityType: node
 cache: true
@@ -3,7 +3,7 @@ status: true
 dependencies:
  module:
    - node
-id: node.highlighted_bottom
-label: 'Highlighted Bottom'
+id: node.card_common_alt
+label: 'Card common alt'
 targetEntityType: node
 cache: true
@@ -1,9 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.highlighted_medium
-label: 'Highlighted Medium'
-targetEntityType: node
-cache: true
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_audio_file
+    - media.type.audio
+  module:
+    - file
+id: media.audio.field_media_audio_file
+field_name: field_media_audio_file
+entity_type: media
+bundle: audio
+label: 'Audio file'
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_extensions: 'mp3 wav aac'
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  max_filesize: ''
+  description_field: false
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_file
+    - media.type.file
+  enforced:
+    module:
+      - media
+  module:
+    - file
+id: media.file.field_media_file
+field_name: field_media_file
+entity_type: media
+bundle: file
+label: File
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages'
+  max_filesize: ''
+  handler: 'default:file'
+  handler_settings: {  }
+  description_field: false
+field_type: file
@@ -0,0 +1,40 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_image
+    - media.type.image
+  enforced:
+    module:
+      - media
+  module:
+    - image
+id: media.image.field_media_image
+field_name: field_media_image
+entity_type: media
+bundle: image
+label: Image
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  alt_field: true
+  alt_field_required: true
+  title_field: false
+  title_field_required: false
+  max_resolution: ''
+  min_resolution: ''
+  default_image:
+    uuid: null
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_oembed_video
+    - media.type.remote_video
+id: media.remote_video.field_media_oembed_video
+field_name: field_media_oembed_video
+entity_type: media
+bundle: remote_video
+label: 'Video URL'
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_video_file
+    - media.type.video
+  module:
+    - file
+id: media.video.field_media_video_file
+field_name: field_media_video_file
+entity_type: media
+bundle: video
+label: 'Video file'
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_extensions: mp4
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  max_filesize: ''
+  description_field: false
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: file
@@ -23,6 +23,5 @@ settings:
    sort:
      field: name
      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
+    auto_create: true
 field_type: entity_reference
@@ -0,0 +1,22 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - media
+id: media.field_media_audio_file
+field_name: field_media_audio_file
+entity_type: media
+type: file
+settings:
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: public
+module: file
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - media
+  module:
+    - file
+    - media
+id: media.field_media_file
+field_name: field_media_file
+entity_type: media
+type: file
+settings:
+  uri_scheme: public
+  target_type: file
+  display_field: false
+  display_default: false
+module: file
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - media
+  module:
+    - file
+    - image
+    - media
+id: media.field_media_image
+field_name: field_media_image
+entity_type: media
+type: image
+settings:
+  default_image:
+    uuid: null
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: public
+module: image
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+id: media.field_media_oembed_video
+field_name: field_media_oembed_video
+entity_type: media
+type: string
+settings:
+  max_length: 255
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
@@ -0,0 +1,22 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - media
+id: media.field_media_video_file
+field_name: field_media_video_file
+entity_type: media
+type: file
+settings:
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: public
+module: file
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 1440
      height: 620
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 2880
      height: 1240
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 1536
      height: 1024
@@ -5,9 +5,10 @@ name: large_3_2_768x512
 label: 'Large 3:2 (768x512)'
 effects:
  36c9f14a-8f5e-4794-92ea-bffab074f52e:
-    uuid: c7627da6-934e-47e2-a795-f10a424bda34
+    uuid: 36c9f14a-8f5e-4794-92ea-bffab074f52e
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 768
      height: 512
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 1024
      height: 440
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 1200
      height: 800
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 600
      height: 400
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 266
      height: 236
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 1440
      height: 617
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 768
      height: 330
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 900
      height: 900
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 600
      height: 600
@@ -9,5 +9,6 @@ effects:
    id: image_scale_and_crop
    weight: 1
    data:
+      anchor: center-center
      width: 300
      height: 300
@@ -0,0 +1,12 @@
+langcode: en
+status: true
+dependencies: {  }
+id: audio
+label: Audio
+description: 'A locally hosted audio file.'
+source: audio_file
+queue_thumbnail_downloads: false
+new_revision: true
+source_configuration:
+  source_field: field_media_audio_file
+field_map: {  }
@@ -0,0 +1,12 @@
+langcode: en
+status: true
+dependencies: {  }
+id: file
+label: File
+description: "Use local files for reusable media."
+source: file
+queue_thumbnail_downloads: false
+new_revision: true
+source_configuration:
+  source_field: field_media_file
+field_map: {  }
@@ -0,0 +1,12 @@
+langcode: en
+status: true
+dependencies: {  }
+id: image
+label: Image
+description: "Use local images for reusable media."
+source: image
+queue_thumbnail_downloads: false
+new_revision: true
+source_configuration:
+  source_field: field_media_image
+field_map: {  }
@@ -0,0 +1,16 @@
+langcode: en
+status: true
+dependencies: {  }
+id: remote_video
+label: 'Remote video'
+description: 'A remotely hosted video from YouTube or Vimeo.'
+source: 'oembed:video'
+queue_thumbnail_downloads: false
+new_revision: false
+source_configuration:
+  thumbnails_directory: 'public://oembed_thumbnails'
+  providers:
+    - YouTube
+    - Vimeo
+  source_field: field_media_oembed_video
+field_map: {  }
@@ -0,0 +1,12 @@
+langcode: en
+status: true
+dependencies: {  }
+id: video
+label: Video
+description: 'A locally hosted video file.'
+source: video_file
+queue_thumbnail_downloads: false
+new_revision: true
+source_configuration:
+  source_field: field_media_video_file
+field_map: {  }
@@ -1,8 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: Ingredients
-vid: ingredients
-description: ''
-hierarchy: 0
-weight: 0
@@ -1,8 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: 'Recipe cuisine'
-vid: recipe_cuisine
-description: ''
-hierarchy: 0
-weight: 0
@@ -0,0 +1,42 @@
+langcode: en
+status: true
+dependencies: {  }
+id: author
+label: Author
+weight: 3
+is_admin: null
+permissions:
+  - 'access content overview'
+  - 'access contextual links'
+  - 'access files overview'
+  - 'access in-place editing'
+  - 'access toolbar'
+  - 'cancel account'
+  - 'change own username'
+  - 'create article content'
+  - 'create page content'
+  - 'create recipe content'
+  - 'create terms in recipe_category'
+  - 'create terms in tags'
+  - 'create url aliases'
+  - 'delete article revisions'
+  - 'delete own article content'
+  - 'delete own page content'
+  - 'delete own recipe content'
+  - 'delete page revisions'
+  - 'delete recipe revisions'
+  - 'delete terms in recipe_category'
+  - 'delete terms in tags'
+  - 'edit own article content'
+  - 'edit own page content'
+  - 'edit own recipe content'
+  - 'edit terms in recipe_category'
+  - 'edit terms in tags'
+  - 'use editorial transition create_new_draft'
+  - 'view all revisions'
+  - 'view article revisions'
+  - 'view latest version'
+  - 'view own unpublished content'
+  - 'view page revisions'
+  - 'view recipe revisions'
+  - 'view the administration theme'
@@ -0,0 +1,46 @@
+langcode: en
+status: true
+dependencies: {  }
+id: editor
+label: Editor
+weight: 4
+is_admin: null
+permissions:
+  - 'access content overview'
+  - 'access contextual links'
+  - 'access files overview'
+  - 'access in-place editing'
+  - 'access toolbar'
+  - 'cancel account'
+  - 'change own username'
+  - 'create terms in recipe_category'
+  - 'create terms in tags'
+  - 'create url aliases'
+  - 'delete all revisions'
+  - 'delete any article content'
+  - 'delete any page content'
+  - 'delete any recipe content'
+  - 'delete article revisions'
+  - 'delete page revisions'
+  - 'delete recipe revisions'
+  - 'delete terms in recipe_category'
+  - 'delete terms in tags'
+  - 'edit any article content'
+  - 'edit any page content'
+  - 'edit any recipe content'
+  - 'edit terms in recipe_category'
+  - 'edit terms in tags'
+  - 'revert all revisions'
+  - 'revert article revisions'
+  - 'revert page revisions'
+  - 'revert recipe revisions'
+  - 'use editorial transition archive'
+  - 'use editorial transition archived_published'
+  - 'use editorial transition publish'
+  - 'view all revisions'
+  - 'view any unpublished content'
+  - 'view article revisions'
+  - 'view latest version'
+  - 'view page revisions'
+  - 'view recipe revisions'
+  - 'view the administration theme'
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_small
+    - core.entity_view_mode.node.card
    - node.type.article
  module:
    - node
@@ -58,7 +58,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_small
+          view_mode: card
      fields:
        title:
          id: title
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_small
+    - core.entity_view_mode.node.card
    - node.type.article
    - system.menu.main
  module:
@@ -72,7 +72,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_small
+          view_mode: card
      fields:
        title:
          id: title
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_bottom
+    - core.entity_view_mode.node.card_common
    - core.entity_view_mode.node.rss
    - node.type.recipe
  module:
@@ -218,7 +218,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_bottom
+          view_mode: card_common
      sorts:
        sticky:
          admin_label: ''
@@ -256,7 +256,7 @@ display:
          row_class: ''
          default_row_class: true
          uses_fields: false
-      title: Recipes
+      title: Home
      header:
        area:
          id: area
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_medium
-    - core.entity_view_mode.node.highlighted_top
+    - core.entity_view_mode.node.card_common
+    - core.entity_view_mode.node.card_common_alt
    - node.type.article
    - node.type.recipe
  module:
@@ -60,7 +60,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_top
+          view_mode: card_common
      fields:
        title:
          id: title
@@ -254,7 +254,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_medium
+          view_mode: card_common_alt
      pager:
        type: some
        options:
@@ -0,0 +1,169 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.tags
+  module:
+    - taxonomy
+    - user
+id: recipe_collections
+label: 'Recipe Collections'
+module: views
+description: ''
+tag: ''
+base_table: taxonomy_term_field_data
+base_field: tid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: some
+        options:
+          items_per_page: 16
+          offset: 0
+      style:
+        type: grid
+        options:
+          grouping: {  }
+          columns: 4
+          automatic_width: false
+          alignment: vertical
+          col_class_default: true
+          col_class_custom: ''
+          row_class_default: true
+          row_class_custom: ''
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: taxonomy_term_field_data
+          field: name
+          entity_type: taxonomy_term
+          entity_field: name
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          type: string
+          settings:
+            link_to_entity: true
+          plugin_id: term_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          convert_spaces: false
+      filters:
+        vid:
+          id: vid
+          table: taxonomy_term_field_data
+          field: vid
+          value:
+            tags: tags
+          entity_type: taxonomy_term
+          entity_field: vid
+          plugin_id: bundle
+      sorts:
+        name:
+          id: name
+          table: taxonomy_term_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: taxonomy_term
+          entity_field: name
+          plugin_id: standard
+      title: 'Recipe collections'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      tags: {  }
+  block:
+    display_plugin: block
+    id: block
+    display_title: Block
+    position: 1
+    display_options:
+      display_extenders: {  }
+      block_hide_empty: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      tags: {  }
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_small
+    - core.entity_view_mode.node.card
    - node.type.recipe
    - system.menu.main
  module:
@@ -72,7 +72,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_small
+          view_mode: card
      fields:
        title:
          id: title
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
  config:
-    - core.entity_view_mode.node.highlighted_small
+    - core.entity_view_mode.node.card
  module:
    - node
    - taxonomy
@@ -221,7 +221,7 @@ display:
        type: 'entity:node'
        options:
          relationship: none
-          view_mode: highlighted_small
+          view_mode: card
      header:
        entity_taxonomy_term:
          id: entity_taxonomy_term
@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.article
+    - node.type.page
+    - node.type.recipe
+  module:
+    - content_moderation
+id: editorial
+label: Editorial
+type: content_moderation
+type_settings:
+  states:
+    archived:
+      label: Archived
+      weight: 5
+      published: false
+      default_revision: true
+    draft:
+      label: Draft
+      published: false
+      default_revision: false
+      weight: -5
+    published:
+      label: Published
+      published: true
+      default_revision: true
+      weight: 0
+  transitions:
+    archive:
+      label: Archive
+      from:
+        - published
+      to: archived
+      weight: 2
+    archived_draft:
+      label: 'Restore to Draft'
+      from:
+        - archived
+      to: draft
+      weight: 3
+    archived_published:
+      label: Restore
+      from:
+        - archived
+      to: published
+      weight: 4
+    create_new_draft:
+      label: 'Create New Draft'
+      to: draft
+      weight: 0
+      from:
+        - draft
+        - published
+    publish:
+      label: Publish
+      to: published
+      weight: 1
+      from:
+        - draft
+        - published
+  entity_types:
+    node:
+      - article
+      - page
+      - recipe
@@ -3,8 +3,7 @@ type: profile
 description: 'Install an example site that shows off some of Drupal’s capabilities.'
 version: VERSION
 core: 8.x
-hidden: true
-dependencies:
+install:
  - node
  - history
  - big_pipe
@@ -22,6 +21,7 @@ dependencies:
  - editor
  - help
  - image
+  - media
  - menu_ui
  - options
  - path
@@ -40,6 +40,8 @@ dependencies:
  - tour
  - automated_cron
  - responsive_image
+  - content_moderation
+  - workflows
 themes:
  - seven
  - umami
@@ -31,8 +31,8 @@ function demo_umami_form_install_configure_submit($form, FormStateInterface $for
 */
 function demo_umami_toolbar() {
  // Add a warning about using an experimental profile.
-  // @todo: This can be removed once a generic warning for experimental profiles has been introduced.
-  // @see https://www.drupal.org/project/drupal/issues/2934374
+  // @todo This can be removed once a generic warning for experimental profiles
+  //   has been introduced. https://www.drupal.org/project/drupal/issues/2934374
  $items['experimental-profile-warning'] = [
    '#weight' => 999,
    '#cache' => [
@@ -3,6 +3,7 @@ Creative Commons Attribution-ShareAlike 4.0 International License

 The following image files:

+chili-sauce-umami.jpg by Elliot Ward
 chocolate-brownie-umami.jpg by Keith Jay
 heritage-carrots.jpg by Keith Jay
 home-grown-herbs.jpg by Keith Jay
@@ -16,7 +17,8 @@ veggie-pasta-bake-hero-umami.jpg by Keith Jay
 veggie-pasta-bake-umami.jpg by Keith Jay
 victoria-sponge-umami.jpg by Keith Jay
 watercress-soup-umami.jpg by Keith Jay
-
+crema-catalana-umami.jpg by Cristina Chumillas
+mojito-mocktail.jpg by Keith Jay
 are all licensed under a http://creativecommons.org/licenses/by-sa/4.0/ Creative
 Commons Attribution-ShareAlike 4.0 International License.

@@ -0,0 +1,13 @@
+<p>You follow the recipe, you weigh all your ingredients, you use the right oven temperature and you take your time and yet still, your baking comes out with a soggy bottom, fails to rise or just tastes plain horrible. We have come up with a list of the most frustrating baking problems and the techniques you can use to try and avoid them.</p>
+<h2>Your cake failed to rise</h2>
+<p>Don't under any circumstances open the oven door in the middle of the cooking time. The heat will come whooshing out, destroying the chemical reaction taking place inside your cake. Your raising agent needs the heat to become activated and you might kill it off.</p>
+<h2>Your cake is chewy and tough</h2>
+<p>If your light sponge is the consistency of a spare tire, you might have over-mixed your batter. Keep the lightness inside your cake mixture by carefully and gently folding in the ingredients and only to the point they are just mixed. If you over-fold, the gluten in the flour will start to come out and you'll be making bread instead of cake.</p>
+<h2>Your cookies burned</h2>
+<p>A great trick is to use light colored bakeware, rather than black. It is less likely to absorb the heat and transfer it to the bottom of your biscuits. Using baking paper will also help with this. Also, using too much sugar can result in your cookies browning too much and giving them a caramelized look.</p>
+<h2>Split top to your cake or bread</h2>
+<p>Your oven is very likely too hot. If you suspect your oven doesn't keep to the right temperature, invest in a thermometer and check it regularly throughout the cooking. With bread, over-mixing the dough can result in a cracked or split top.</p>
+<h2>The dreaded soggy bottom</h2>
+<p>As mentioned above, the color of your pan is important. In this case, a dark pan will increase the heat at the bottom and give you that crisp underneath that you want. If you are using a flaky pastry, you really need to blind bake it. Putting your pie towards the bottom of the oven will increase the heat reaching that part.</p>
+<h2>Your pastry has shrunk</h2>
+<p>You simply tried to make it stretch too far. When rolling, don't try to make it too thin or too big and when draping over your pan, allow it to settle on its own without stretching it to fit. Or just add more pastry - everyone loves pastry anyway!</p>
@@ -0,0 +1,21 @@
+<p>Having a cocktail party? Then why not serve up something just as special for those who don't drink alcohol but do want to join in on all the fun? After all, what cocktail party is complete without those incredible looking glasses of mixed fruits, bright colors and of course, the little umbrellas? Do your bit for the environment by ditching the plastic straws and get hold of some great looking alternatives made out of glass, metal, or even bamboo. Don't forget the classic cocktail glasses and cool tumblers to really bring these recipes to life.
+</p>
+<p>
+So, grab the cocktail mixer, skip the spirits, and shake up these deliciously refreshing mocktails that won't leave you or your guests, short on flavor or style.
+</p>
+<h2>Mango-licious</h2>
+<p>This delicious drink has a sophisticated taste that is ideal for adults and the color is perfect for a late summer BBQ.</p>
+<h3>Instructions:</h3>
+<p>Give a few slices of cucumber and a little honey a good shake in a cocktail shaker. Add a spirit measure of mango puree and the juice of one lime. Add some ice and shake for all you're worth. Using a strainer, pour into a fancy glass and top with ginger beer. A few slices of lime and you're ready to go.</p>
+<h2>Mocky Mojito</h2>
+<p>There's nothing quite like a Mojito on a warm day and this version is ideal for a relaxing end of the day moment of bliss in the garden.</p>
+<h3>Instructions:</h3>
+<p>Muddle sugar, a squeeze of lime, and mint leaves in a tall glass, then add a few chunks of ice, top with the juice of a blood orange (for the sunset effect), and add a splash of soda water. Add a few sprigs of mint for an authentic look.</p>
+<h2>Sinless Strawberry Martini</h2>
+<p>Strawberries add a beautiful rich red to this mocktail, while the ginger gives it a little kick. Serve in a proper martini glass, but maybe avoid the olives.</p>
+<h3>Instructions:</h3>
+<p>Muddle a strawberry with a dash a ginger beer and some sugar syrup in a cocktail shaker. Add a capful of elderflower cordial and a few mint leaves. Throw in a slice of orange and lemon and shake with ice. Strain into your glass and enjoy the sweet strawberry flavor.</p>
+<h2>Coconut Queen</h2>
+<p>Crazy about coconuts? Then you'll love the refreshing taste of this coconut based mocktail. The flavors give a hint of the tropical, while the look is grown-up sophistication.</p>
+<h3>Instructions:</h3>
+<p>Add sliced cucumbers, the juice of a lime or two, and some mint leaves to a pitcher of coconut water and leave to chill and infuse for a few hours in the fridge. You can also add some sugar if you fancy this sweeter. Serve poured into glasses full of ice with sliced cucumber and mint leaves. Simple and beautiful.</p>
@@ -3,3 +3,5 @@ Give it a go and grow your own herbs,give-it-a-go-and-grow-your-own-herbs.html,H
 The real deal for supermarket savvy shopping,the-real-deal-for-supermarket-savvy-shopping.html,Megan Collins Quinlan,articles/the-real-deal-for-supermarket-savvy-shopping,supermarket-savvy-umami.jpg,Products presented on supermarket shelving.,"Supermarkets,Shopping"
 The umami guide to our favorite mushrooms,the-umami-guide-to-our-favourite-mushrooms.html,Umami,articles/the-umami-guide-to-our-favourite-mushrooms,mushrooms-umami.jpg,A delightful selection of mushroom varieties laid out on a simple wooden plate.,"Mushrooms,Vegetarian"
 Let's hear it for carrots,lets-hear-it-for-carrots.html,Umami,articles/lets-hear-it-for-carrots,heritage-carrots.jpg,"Purple, orange, yellow and white heritage carrots.","Carrots,Vegetarian,Healthy"
+Baking mishaps - our troubleshooting tips,baking-mishaps-our-troubleshooting-tips.html,"Umami",articles/baking-mishaps-our-troubleshooting-tips,chocolate-brownie-umami.jpg,"A delicious chocolate brownie","Baking,Learn to cook"
+Skip the spirits with delicious mocktails,skip-the-spirits-with-delicious-mocktails.html,Megan Collins Quinlan,articles/skip-the-spirits-with-delicious-mocktails,mojito-mocktail.jpg,"Fresh mojito mocktail with garnish of mint leaves, ice, and sliced lime","Alcohol free,Drinks,Party,Cocktail party,Dinner party"
@@ -0,0 +1,14 @@
+<ol>
+  <li>Preheat the oven to 400°F/200°C.</li>
+  <li>Finely chop the red onions and sweat gently on a low heat in olive oil for 5 minutes.</li>
+  <li>Peel the garlic and add it to the onions.</li>
+  <li>Meanwhile, chop the bell peppers to 1 inch pieces. Add the bell peppers and tomatoes to a roasting dish, and rub with lemon juice, olive oil and black pepper. Transfer to the oven and roast for 30 minutes.</li>
+  <li>Once the onions and garlic have softened, chop and add the chilies, seeds and all. Mix well and continue to gently fry.</li>
+  <li>Thoroughly wash your hands following handling raw chilies.</li>
+  <li>Once the tomatoes and bell peppers have finished roasting, add them to the pan. Cook for at least 10 minutes, breaking them up with a masher or a hand blender as they simmer. Once broken up, mix in the sugar.</li>
+  <li>Transfer the sauce to a blender and blend until smooth.</li>
+  <li>Return to the pan and add the vinegar and juice of the limes.</li>
+  <li>Cook through for a further 10 minutes, then leave to cool.</li>
+  <li>Transfer to sterilized jars and keep refrigerated.</li>
+  <li>Leave for at least two weeks before tasting.</li>
+</ol>
@@ -0,0 +1,9 @@
+<ol>
+  <li>Mix the egg yolks, sugar, and cornstarch with 1/3 of the milk.</li>
+  <li>In a saucepan, boil 2/3 of the milk with the lemon peel and cinnamon.</li>
+  <li>After 3 minutes, remove from the heat and take out the lemon and cinnamon.</li>
+  <li>Slowly add the egg mixture to the hot milk through a strainer to ensure there are no lumps.</li>
+  <li>Return it to the heat until it boils, stirring constantly.</li>
+  <li>Once the mixture has begun to thicken, remove from the heat and put it into individual bowls to cool.</li>
+  <li>For an authentic finish, sprinkle with sugar and brown with a blowtorch or under a preheated broiler to caramelize.</li>
+</ol>
@@ -3,6 +3,8 @@ Deep mediterranean quiche,mediterranean-quiche-umami.jpg,"A delicious deep layer
 Vegan chocolate brownies,chocolate-brownie-umami.jpg,A white plate with a vegan chocolate brownie covered in dark vegan chocolate,These sumptuous brownies should be gooey on the inside and crisp on the outside. A perfect indulgence!,Umami,Snack,20,20,40,,"170g self-raising flour, 3 tbsp cocoa powder, 170g caster sugar, 5 tbsp vegetable oil, 1 tsp vanilla extract, 1 pinch salt, 230ml soy milk",chocolate-brownie-umami.html,8,,recipes/vegan-chocolate-brownies
 Super easy vegetarian pasta bake,veggie-pasta-bake-umami.jpg,Cheesy pasta dish with vegetarian sausages and topped with mozzarella cheese and basil,A wholesome pasta bake is the ultimate comfort food. This delicious bake is super quick to prepare and an ideal midweek meal for all the family.,Umami,Main course,5,20,25,easy,"400g wholewheat pasta, 1 onion, 2 garlic cloves, 1 pack vegetarian sausages, 400g chopped tomatoes, 50g sliced sun dried tomatoes, 1 pinch sugar, 3 tbsp red pesto, 50g cheddar cheese, Basil or mixed herbs, 100g mozzarella",veggie-pasta-bake-umami.html,4,"Vegetarian,Pasta,Baked",recipes/super-easy-vegetarian-pasta-bake
 Watercress soup,watercress-soup-umami.jpg,Watercress soup with a sprig of coriander as garnish in a white bowl with green trim.,"A wonderfully simple and light soup, making the most of seasonal, local produce. ",Umami,Starter,10,20,30,easy,"3 bunches watercress,3 potatoes,3 onions,2 leeks,800ml stock,5 tbsp crème fraîche",watercress-soup-umami.html,4,"Soup,Vegetarian",recipes/watercress-soup
-Victoria sponge cake,victoria-sponge-umami.jpg,"A classic, uncut Victoria sponge with a deep filling of butter cream and jam","A traditional Victoria sponge cake, perfect for any afternoon with a cup of tea.",Umami,Desert,20,20,40,easy,"225g butter or margarine,225g caster sugar,225g self-raising flour,4 eggs,1 tsp baking powder,3 tbsp of jam for the filling,Icing sugar to dust the top,Cream to serve",victoria-sponge-umami.html,10,Cake,recipes/victoria-sponge-cake
+Victoria sponge cake,victoria-sponge-umami.jpg,"A classic, uncut Victoria sponge with a deep filling of butter cream and jam","A traditional Victoria sponge cake, perfect for any afternoon with a cup of tea.",Umami,Dessert,20,20,40,easy,"225g butter or margarine,225g caster sugar,225g self-raising flour,4 eggs,1 tsp baking powder,3 tbsp of jam for the filling,Icing sugar to dust the top,Cream to serve",victoria-sponge-umami.html,10,Cake,recipes/victoria-sponge-cake
 Gluten free pizza,pizza-umami.jpg,"Olives, basil, and mozzarella top a gluten free pizza crust with marinara sauce.","A gorgeous and simple gluten free pizza, with deliciously indulgent mozzeralla and Parma ham. Can easily be vegetarian by leaving out the ham.",Umami,Main course,15,15,30,,"400g gluten free flour, 125ml warm water, 125ml milk, 1 sachet dried yeast, 2 tsp sugar, 1 tsp salt, 2 tbsp olive oil, 4 tbsp tomato puree, 1 garlic clove, Fresh basil, 200g mozzarella, 100g rocket, 5 slices Parma ham",pizza-umami.html,4,,recipes/gluten-free-pizza
 Thai green curry,thai-green-curry-umami.jpg,"A traditional bowl of creamy, aromatic Thai green curry with chunks of chicken in a small bowl with jasmine rice.",A quick and easy version of the classic Thai green curry. Perfect for a midweek meal!,Umami,Main course,10,15,25,,"400g coconut milk, 400g chicken or tofu, 1 tbsp Thai green curry paste, 1 garlic clove, 2 tsp fish sauce, 400g mushrooms, 200g green beans, Fresh coriander leaves, Jasmine rice",thai-green-curry-umami.html,4,,recipes/thai-green-curry
+Crema catalana,crema-catalana-umami.jpg,"Typical Catalan dessert made from cream and egg yolks, covered with a traditional layer of caramelized sugar to provide a crispy contrast.",Enjoy this sweet recipe for one of the oldest desserts in Europe. It requires very few ingredients!,Umami,Dessert,10,20,30,,"1l milk, 200g sugar, 6 egg yolks, 30g cornstarch, 1 cinnamon stick, 1 piece lemon peel",crema-catalana-umami.html,8,"Egg, Vegetarian",recipes/crema-catalana
+Fiery chili sauce,chili-sauce-umami.jpg,"An iridescent array of chilies, onions, and garlic, slowly sweating over a low heat","A rich and fiery chili sauce. Take care when handling chili peppers. And serve sparingly!",Umami,Accompaniment,10,50,60,easy,"2 red onions, 1 lemon, 2 limes, 250ml malt vinegar, 7 garlic cloves, 1 green bell pepper, 1 red bell pepper, 800g cherry tomatoes, 30 mixed chilies, Olive oil, 1 tbsp ground black pepper, 1 tbsp brown sugar",chili-sauce-umami.html,60,Vegetarian,recipes/fiery-chili-sauce
@@ -12,7 +12,7 @@ use Drupal\demo_umami_content\InstallHelper;
 */
 function demo_umami_content_install() {
  if (!\Drupal::service('config.installer')->isSyncing()) {
-    \Drupal::classResolver()->getInstanceFromDefinition(InstallHelper::class)->importContent();
+    \Drupal::classResolver(InstallHelper::class)->importContent();
  }
 }

@@ -21,6 +21,6 @@ function demo_umami_content_install() {
 */
 function demo_umami_content_uninstall() {
  if (!\Drupal::service('config.installer')->isSyncing()) {
-    \Drupal::classResolver()->getInstanceFromDefinition(InstallHelper::class)->deleteImportedContent();
+    \Drupal::classResolver(InstallHelper::class)->deleteImportedContent();
  }
 }
@@ -81,12 +81,41 @@ class InstallHelper implements ContainerInjectionInterface {
   * Imports default contents.
   */
  public function importContent() {
-    $this->importArticles()
+    $this->importEditors()
+      ->importArticles()
      ->importRecipes()
      ->importPages()
      ->importBlockContent();
  }

+  /**
+   * Imports editors.
+   *
+   * Other users are created as their content is imported. However, editors
+   * don't have their own content so are created here instead.
+   *
+   * @return $this
+   */
+  protected function importEditors() {
+    $user_storage = $this->entityTypeManager->getStorage('user');
+    $editors = [
+      'Margaret Hopper',
+      'Grace Hamilton',
+    ];
+    foreach ($editors as $name) {
+      $user = $user_storage->create([
+        'name' => $name,
+        'status' => 1,
+        'roles' => ['editor'],
+        'mail' => mb_strtolower(str_replace(' ', '.', $name)) . '@example.com',
+      ]);
+      $user->enforceIsNew();
+      $user->save();
+      $this->storeCreatedContentUuids([$user->uuid() => 'user']);
+    }
+    return $this;
+  }
+
  /**
   * Imports articles.
   *
@@ -104,6 +133,7 @@ class InstallHelper implements ContainerInjectionInterface {
        $values = [
          'type' => 'article',
          'title' => $data['title'],
+          'moderation_state' => 'published',
        ];
        // Fields mapping starts.
        // Set Body Field.
@@ -167,6 +197,7 @@ class InstallHelper implements ContainerInjectionInterface {
          'type' => 'recipe',
          // Title field.
          'title' => $data['title'],
+          'moderation_state' => 'published',
        ];
        // Set article author.
        if (!empty($data['author'])) {
@@ -264,6 +295,7 @@ class InstallHelper implements ContainerInjectionInterface {
        $values = [
          'type' => 'page',
          'title' => $data['title'],
+          'moderation_state' => 'published',
        ];
        // Fields mapping starts.
        // Set Body Field.
@@ -401,10 +433,12 @@ class InstallHelper implements ContainerInjectionInterface {
    $user_storage = $this->entityTypeManager->getStorage('user');
    $users = $user_storage->loadByProperties(['name' => $name]);;
    if (empty($users)) {
-      // Creating user without any email/password.
+      // Creating user without any password.
      $user = $user_storage->create([
        'name' => $name,
        'status' => 1,
+        'roles' => ['author'],
+        'mail' => mb_strtolower(str_replace(' ', '.', $name)) . '@example.com',
      ]);
      $user->enforceIsNew();
      $user->save();
@@ -2,7 +2,6 @@

 namespace Drupal\Tests\demo_umami_content\Functional;

-use Drupal\Core\Site\Settings;
 use Drupal\Tests\BrowserTestBase;

 /**
@@ -18,7 +17,7 @@ class DefaultContentFilesAccessTest extends BrowserTestBase {
  public function testAccessDeniedToFiles() {
    // The demo_umami profile should not be used because we want to ensure that
    // if you install another profile these files are not available.
-    $this->assertNotSame('demo_umami', Settings::get('install_profile'));
+    $this->assertNotSame('demo_umami', \Drupal::installProfile());

    $files_to_test = [
      'images/chocolate-brownie-umami.jpg',
--- a/Show More
+++ b/Show More