Skip to content

Commit

Permalink
Merge pull request #58 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Release 28.9.2022 #2
  • Loading branch information
khalima authored Sep 28, 2022
2 parents e37254d + 298a754 commit 481d12c
Show file tree
Hide file tree
Showing 19 changed files with 207 additions and 178 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"drupal/helfi_tunnistamo": "^2.0",
"drupal/redis": "^1.5",
"drupal/stage_file_proxy": "^1.2",
"drush/drush": "^10.4 || ^11"
"drush/drush": "^10.4 || ^11",
"twig/twig": "v2.15.2"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
Expand Down
66 changes: 35 additions & 31 deletions composer.lock

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

23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_fallback_menu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: 0b727728-7802-472b-ad0e-b84ed9fc2260
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_fallback_menu
theme: hdbt
region: header_branding
weight: 0
provider: null
plugin: external_menu_block_fallback
settings:
id: external_menu_block_fallback
label: 'External - Fallback menu'
label_display: '0'
provider: helfi_navigation
level: 1
expand_all_items: true
depth: 0
visibility: { }
23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_footer_bottom_navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: e68e887e-105a-40ce-b219-fe184ec4f82c
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_footer_bottom_navigation
theme: hdbt
region: footer_bottom
weight: 0
provider: null
plugin: 'external_menu_block:footer-bottom-navigation'
settings:
id: 'external_menu_block:footer-bottom-navigation'
label: 'External - Footer bottom navigation'
label_display: '0'
provider: helfi_navigation
level: 1
expand_all_items: false
depth: 1
visibility: { }
23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_footer_top_navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: 4a55a712-de1f-4f75-9836-3ff6a4f71701
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_footer_top_navigation
theme: hdbt
region: footer_top
weight: 1
provider: null
plugin: 'external_menu_block:footer-top-navigation'
settings:
id: 'external_menu_block:footer-top-navigation'
label: 'City of Helsinki'
label_display: visible
provider: helfi_navigation
level: 1
expand_all_items: false
depth: 1
visibility: { }
23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_footer_top_navigation_2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: dfae8130-7c0f-4c59-9b52-c4abbda3b10e
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_footer_top_navigation_2
theme: hdbt
region: footer_top
weight: 2
provider: null
plugin: 'external_menu_block:footer-top-navigation-2'
settings:
id: 'external_menu_block:footer-top-navigation-2'
label: Connect
label_display: visible
provider: helfi_navigation
level: 1
expand_all_items: false
depth: 1
visibility: { }
23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_header_language_links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: 849ea602-8e1e-456e-ab3c-f863f4c0804d
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_header_language_links
theme: hdbt
region: header_branding
weight: 0
provider: null
plugin: 'external_menu_block:header-language-links'
settings:
id: 'external_menu_block:header-language-links'
label: 'External - Header language links'
label_display: '0'
provider: helfi_navigation
level: 1
expand_all_items: false
depth: 1
visibility: { }
23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_header_top_navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: ec6b5d6e-5852-4a93-9c23-904928590be8
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_header_top_navigation
theme: hdbt
region: header_top
weight: 0
provider: null
plugin: 'external_menu_block:header-top-navigation'
settings:
id: 'external_menu_block:header-top-navigation'
label: 'External - Header top navigation'
label_display: '0'
provider: helfi_navigation
level: 1
expand_all_items: false
depth: 1
visibility: { }
23 changes: 23 additions & 0 deletions conf/cmi/block.block.external_menu_mega_menu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: 2e873e53-3792-48f6-b265-c320fafd6a3f
langcode: en
status: true
dependencies:
module:
- helfi_navigation
theme:
- hdbt
id: external_menu_mega_menu
theme: hdbt
region: header_branding
weight: 0
provider: null
plugin: external_menu_block_main_navigation
settings:
id: external_menu_block_main_navigation
label: 'External - Mega menu'
label_display: '0'
provider: helfi_navigation
level: 1
depth: 2
expand_all_items: true
visibility: { }
31 changes: 0 additions & 31 deletions conf/cmi/block.block.footerbottomnavigation.yml

This file was deleted.

22 changes: 0 additions & 22 deletions conf/cmi/block.block.footertopblock.yml

This file was deleted.

Loading

0 comments on commit 481d12c

Please sign in to comment.