Merge with master.

composer.json

@@ -150,6 +150,9 @@
             },
             "drupal/views_field_formatter": {
                 "2874811 - Add option to show/hide empty views": "https://www.drupal.org/files/issues/Option-added-to-hide-empty-views-2874811.patch"
+            },
+            "drupal/core": {
+                "1236098 - Notice: Undefined index in _color_rewrite_stylesheet()": "https://www.drupal.org/files/issues/undefined-index-in-_color_rewrite_stylesheet-1236098-37.patch"
             }
         }
     },

docs/Content structure/Paragraphs/Featured Highlights.md

@@ -0,0 +1,11 @@
+# Featured Highlights
+
+Provides a paragraph containing blocks of specific types positioned as 2, 3 or 4 blocks per row.
+
+### Fields
+
+| Name                      | Machine name               | Required | Description                                                                                 |
+| ------------------------- | -------------------------- | -------- | ------------------------------------------------------------------------------------------- |
+| Title                     | field_prgf_title           | No       | Paragraph title.                                                                            |
+| Style                     | field_prgf_grid_style      | Yes      | Select list with following values: 2:2 items per row, 3:3 items per row, 4:4 items per row. |
+| Featured Highlights block | field_prgf_block_ref_unlim | Yes      | Create a new one or pick up an existing block of given types: Featured Highlight Block, Basic Block, Simple Block, Date block.                                 |

drupal-org-core.make

@@ -2,3 +2,5 @@ api = 2
 core = 8.x
 projects[drupal][type] = core
 projects[drupal][version] = 8.3.7
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2346893-233.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/undefined-index-in-_color_rewrite_stylesheet-1236098-37.patch

modules/custom/openy_group_schedules/src/Form/GroupexFormFull.php

@@ -155,6 +155,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $location
     $formatted_results = NULL;
     $conf = $this->configFactory->get('openy_group_schedules.settings');
     $max_age = is_numeric($conf->get('cache_max_age')) ? $conf->get('cache_max_age') : 3600;
+    $instructors_options = [];
 
     // Get location options.
     $this->locationOptions = $this->getOptions($this->request(['query' => ['locations' => TRUE]]), 'id', 'name');
@@ -425,7 +426,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $location
 
     $form['result'] = [
       '#prefix' => '</div><div class="groupex-results">',
-      'results' => $formatted_results,
+      '#results' => $formatted_results,
       '#suffix' => '</div>',
       '#weight' => 10,
     ];

modules/openy_features/openy_block/modules/openy_block_featured_highlights/config/install/block_content.type.featured_highlights_block.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+id: featured_highlights_block
+label: 'Featured Highlights Block'
+revision: 0
+description: 'The Featured Highlights Block.'

modules/openy_features/openy_block/modules/openy_block_featured_highlights/config/install/core.entity_form_display.block_content.featured_highlights_block.default.yml

@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.featured_highlights_block
+    - entity_browser.browser.images_library
+    - field.field.block_content.featured_highlights_block.field_block_content
+    - field.field.block_content.featured_highlights_block.field_featured_hl_block_image
+    - field.field.block_content.featured_highlights_block.field_featured_hl_block_link
+  module:
+    - content_moderation
+    - entity_browser
+    - link
+    - text
+id: block_content.featured_highlights_block.default
+targetEntityType: block_content
+bundle: featured_highlights_block
+mode: default
+content:
+  field_block_content:
+    weight: 3
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textarea
+    region: content
+  field_featured_hl_block_image:
+    weight: 2
+    settings:
+      entity_browser: images_library
+      field_widget_display: rendered_entity
+      field_widget_edit: true
+      field_widget_remove: true
+      selection_mode: selection_append
+      field_widget_display_settings:
+        view_mode: thumbnail_for_preview
+      open: false
+    third_party_settings: {  }
+    type: entity_browser_entity_reference
+    region: content
+  field_featured_hl_block_link:
+    weight: 1
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings: {  }
+    type: link_default
+    region: content
+  info:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  langcode: true

modules/openy_features/openy_block/modules/openy_block_featured_highlights/config/install/core.entity_view_display.block_content.featured_highlights_block.default.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.featured_highlights_block
+    - field.field.block_content.featured_highlights_block.field_block_content
+    - field.field.block_content.featured_highlights_block.field_featured_hl_block_image
+    - field.field.block_content.featured_highlights_block.field_featured_hl_block_link
+  module:
+    - link
+    - text
+id: block_content.featured_highlights_block.default
+targetEntityType: block_content
+bundle: featured_highlights_block
+mode: default
+content:
+  field_block_content:
+    type: text_trimmed
+    weight: 2
+    region: content
+    label: hidden
+    settings:
+      trim_length: 140
+    third_party_settings: {  }
+  field_featured_hl_block_image:
+    type: entity_reference_entity_view
+    weight: 1
+    region: content
+    label: hidden
+    settings:
+      view_mode: node_blog_teaser
+      link: false
+    third_party_settings: {  }
+  field_featured_hl_block_link:
+    type: link_separate
+    weight: 0
+    region: content
+    label: hidden
+    settings:
+      trim_length: 80
+      url_only: false
+      url_plain: false
+      rel: ''
+      target: ''
+    third_party_settings: {  }
+hidden:
+  langcode: true

modules/openy_features/openy_block/modules/openy_block_featured_highlights/config/install/field.field.block_content.featured_highlights_block.field_block_content.yml

@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.featured_highlights_block
+    - field.storage.block_content.field_block_content
+  module:
+    - datalayer
+    - text
+third_party_settings:
+  datalayer:
+    expose: 0
+    label: field_block_content
+id: block_content.featured_highlights_block.field_block_content
+field_name: field_block_content
+entity_type: block_content
+bundle: featured_highlights_block
+label: Description
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long

modules/openy_features/openy_block/modules/openy_block_featured_highlights/config/install/field.field.block_content.featured_highlights_block.field_featured_hl_block_image.yml

@@ -0,0 +1,33 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.featured_highlights_block
+    - field.storage.block_content.field_featured_hl_block_image
+    - media_entity.bundle.image
+  module:
+    - datalayer
+third_party_settings:
+  datalayer:
+    expose: 0
+    label: field_featured_hl_block_image
+id: block_content.featured_highlights_block.field_featured_hl_block_image
+field_name: field_featured_hl_block_image
+entity_type: block_content
+bundle: featured_highlights_block
+label: Image
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:media'
+  handler_settings:
+    target_bundles:
+      image: image
+    sort:
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference