Merge pull request #62 from localgovdrupal/2.x

Pull request to review changes ahead of a 2.0.4 tag release

Author: finnlewis

composer.json

@@ -7,7 +7,7 @@
   "minimum-stability": "dev",
   "require": {
     "drupal/entity_hierarchy": "^2.24",
-    "drupal/layout_paragraphs": "dev-1.0.x",
+    "drupal/layout_paragraphs": "^1.0.0",
     "drupal/tablefield": "dev-2.x",
     "drupal/viewsreference": "^2.0",
     "localgovdrupal/localgov_core": "^2.1",

config/optional/block.block.subsitebanner.yml renamed to config/optional/block.block.localgov_subsite_banner_base.yml

@@ -5,10 +5,10 @@ dependencies:
     - localgov_subsites
   theme:
     - localgov_base
-id: subsitebanner
+id: localgov_subsite_banner_base
 theme: localgov_base
 region: banner
-weight: -7
+weight: 0
 provider: null
 plugin: localgov_subsite_banner
 settings:

config/optional/block.block.localgov_subsite_banner.yml renamed to config/optional/block.block.localgov_subsite_banner_scarfolk.yml

@@ -4,10 +4,10 @@ dependencies:
   module:
     - localgov_subsites
   theme:
-    - localgov_base
-id: localgov_subsite_banner
-theme: localgov_base
-region: content_top
+    - localgov_scarfolk
+id: localgov_subsite_banner_scarfolk
+theme: localgov_scarfolk
+region: banner
 weight: 0
 provider: null
 plugin: localgov_subsite_banner
@@ -16,4 +16,6 @@ settings:
   label: 'Subsite banner'
   provider: localgov_subsites
   label_display: '0'
+  context_mapping:
+    node: '@node.node_route_context:node'
 visibility: {  }

config/optional/block.block.localgov_subsite_navigation.yml renamed to config/optional/block.block.localgov_subsite_navigation_base.yml

@@ -5,7 +5,7 @@ dependencies:
     - localgov_subsites
   theme:
     - localgov_base
-id: localgov_subsite_navigation
+id: localgov_subsite_navigation_base
 theme: localgov_base
 region: sidebar_second
 weight: -4

config/optional/block.block.subsitenavigation.yml renamed to config/optional/block.block.localgov_subsite_navigation_scarfolk.yml

@@ -4,18 +4,16 @@ dependencies:
   module:
     - localgov_subsites
   theme:
-    - localgov_base
-id: subsitenavigation
-theme: localgov_base
+    - localgov_scarfolk
+id: localgov_subsite_navigation_scarfolk
+theme: localgov_scarfolk
 region: sidebar_second
-weight: -7
+weight: -4
 provider: null
 plugin: localgov_subsite_navigation
 settings:
   id: localgov_subsite_navigation
   label: 'Subsite navigation'
   provider: localgov_subsites
-  label_display: visible
-  context_mapping:
-    node: '@node.node_route_context:node'
+  label_display: '0'
 visibility: {  }