From 2babf7639e79ce52ade7f95988016e4d23e9ddab Mon Sep 17 00:00:00 2001 From: Keegan Rankin Date: Thu, 15 Feb 2024 15:56:04 -0800 Subject: [PATCH 1/2] Move the articles view block to content bottom --- config/block.block.article_topics_facet.yml | 2 +- config/block.block.article_type_facet.yml | 2 +- config/block.block.blog_topics_facet.yml | 2 +- config/block.block.home_page_custom_1.yml | 2 +- config/block.block.home_page_custom_2.yml | 2 +- config/block.block.home_page_custom_3.yml | 2 +- config/block.block.home_page_feature.yml | 2 +- config/block.block.octavia_content.yml | 2 +- config/block.block.octavia_local_actions.yml | 2 +- config/block.block.resource_topics_facet.yml | 2 +- config/block.block.resource_type_facet.yml | 2 +- config/block.block.views_block__article_block_promoted.yml | 4 ++-- config/block.block.views_block__blog_block_promoted.yml | 2 +- ...lock.block.views_block__content_by_author_block_author.yml | 2 +- ...ock.views_block__related_content_block_related_content.yml | 2 +- config/block.block.views_block__resource_block_promoted.yml | 2 +- config/views.view.article.yml | 2 +- config/views.view.people.yml | 2 +- config/views.view.resource.yml | 3 ++- 19 files changed, 21 insertions(+), 20 deletions(-) diff --git a/config/block.block.article_topics_facet.yml b/config/block.block.article_topics_facet.yml index f25b4de..19a66f4 100644 --- a/config/block.block.article_topics_facet.yml +++ b/config/block.block.article_topics_facet.yml @@ -15,7 +15,7 @@ _core: id: article_topics_facet theme: octavia region: sidebar_first -weight: 2 +weight: -14 provider: null plugin: 'facet_block:article_topics' settings: diff --git a/config/block.block.article_type_facet.yml b/config/block.block.article_type_facet.yml index 81222a1..7a13690 100644 --- a/config/block.block.article_type_facet.yml +++ b/config/block.block.article_type_facet.yml @@ -15,7 +15,7 @@ _core: id: article_type_facet theme: octavia region: sidebar_first -weight: 4 +weight: -12 provider: null plugin: 'facet_block:article_type' settings: diff --git a/config/block.block.blog_topics_facet.yml b/config/block.block.blog_topics_facet.yml index 0e9744c..241234a 100644 --- a/config/block.block.blog_topics_facet.yml +++ b/config/block.block.blog_topics_facet.yml @@ -15,7 +15,7 @@ _core: id: blog_topics_facet theme: octavia region: sidebar_first -weight: 0 +weight: -15 provider: null plugin: 'facet_block:blog_topics' settings: diff --git a/config/block.block.home_page_custom_1.yml b/config/block.block.home_page_custom_1.yml index 94f3c54..e4f7293 100644 --- a/config/block.block.home_page_custom_1.yml +++ b/config/block.block.home_page_custom_1.yml @@ -16,7 +16,7 @@ _core: id: home_page_custom_1 theme: octavia region: content_bottom -weight: 0 +weight: -15 provider: null plugin: 'block_content:a3a19121-c6a2-4a3f-8225-8e84f5fb0c9d' settings: diff --git a/config/block.block.home_page_custom_2.yml b/config/block.block.home_page_custom_2.yml index f4507d0..69e4529 100644 --- a/config/block.block.home_page_custom_2.yml +++ b/config/block.block.home_page_custom_2.yml @@ -16,7 +16,7 @@ _core: id: home_page_custom_2 theme: octavia region: content_bottom -weight: 2 +weight: -14 provider: null plugin: 'block_content:8f30e41d-3693-43bc-a281-9b11e29df3b8' settings: diff --git a/config/block.block.home_page_custom_3.yml b/config/block.block.home_page_custom_3.yml index f2d6401..9d85567 100644 --- a/config/block.block.home_page_custom_3.yml +++ b/config/block.block.home_page_custom_3.yml @@ -16,7 +16,7 @@ _core: id: home_page_custom_3 theme: octavia region: content_bottom -weight: 4 +weight: -13 provider: null plugin: 'block_content:086d20ee-9e48-4ee3-81ae-263f7dc279ba' settings: diff --git a/config/block.block.home_page_feature.yml b/config/block.block.home_page_feature.yml index 5d8d071..055a511 100644 --- a/config/block.block.home_page_feature.yml +++ b/config/block.block.home_page_feature.yml @@ -19,7 +19,7 @@ _core: id: home_page_feature theme: octavia region: content -weight: 4 +weight: -14 provider: null plugin: 'block_content:2b547200-6da3-4608-aa40-b98a6bea4933' settings: diff --git a/config/block.block.octavia_content.yml b/config/block.block.octavia_content.yml index f9832e4..581c7d2 100644 --- a/config/block.block.octavia_content.yml +++ b/config/block.block.octavia_content.yml @@ -11,7 +11,7 @@ _core: id: octavia_content theme: octavia region: content -weight: 0 +weight: -15 provider: null plugin: system_main_block settings: diff --git a/config/block.block.octavia_local_actions.yml b/config/block.block.octavia_local_actions.yml index 5ace6bc..707fc83 100644 --- a/config/block.block.octavia_local_actions.yml +++ b/config/block.block.octavia_local_actions.yml @@ -9,7 +9,7 @@ _core: id: octavia_local_actions theme: octavia region: content -weight: -20 +weight: -16 provider: null plugin: local_actions_block settings: diff --git a/config/block.block.resource_topics_facet.yml b/config/block.block.resource_topics_facet.yml index ca952be..8e2a27c 100644 --- a/config/block.block.resource_topics_facet.yml +++ b/config/block.block.resource_topics_facet.yml @@ -15,7 +15,7 @@ _core: id: resource_topics_facet theme: octavia region: sidebar_first -weight: 2 +weight: -13 provider: null plugin: 'facet_block:resource_topics' settings: diff --git a/config/block.block.resource_type_facet.yml b/config/block.block.resource_type_facet.yml index 8896c5b..ce5e751 100644 --- a/config/block.block.resource_type_facet.yml +++ b/config/block.block.resource_type_facet.yml @@ -15,7 +15,7 @@ _core: id: resource_type_facet theme: octavia region: sidebar_first -weight: 4 +weight: -11 provider: null plugin: 'facet_block:resource_type' settings: diff --git a/config/block.block.views_block__article_block_promoted.yml b/config/block.block.views_block__article_block_promoted.yml index 4312765..d88b59f 100644 --- a/config/block.block.views_block__article_block_promoted.yml +++ b/config/block.block.views_block__article_block_promoted.yml @@ -14,8 +14,8 @@ _core: default_config_hash: l2bsxK18NjDhsgZCw3TRnHkvHQeHTmWGFggDnzMmU3k id: views_block__article_block_promoted theme: octavia -region: content -weight: 0 +region: content_bottom +weight: -12 provider: null plugin: 'views_block:article-block_promoted' settings: diff --git a/config/block.block.views_block__blog_block_promoted.yml b/config/block.block.views_block__blog_block_promoted.yml index 815816e..1c846d8 100644 --- a/config/block.block.views_block__blog_block_promoted.yml +++ b/config/block.block.views_block__blog_block_promoted.yml @@ -15,7 +15,7 @@ _core: id: views_block__blog_block_promoted theme: octavia region: content -weight: 6 +weight: -12 provider: null plugin: 'views_block:blog-block_promoted' settings: diff --git a/config/block.block.views_block__content_by_author_block_author.yml b/config/block.block.views_block__content_by_author_block_author.yml index b960abf..1e97250 100644 --- a/config/block.block.views_block__content_by_author_block_author.yml +++ b/config/block.block.views_block__content_by_author_block_author.yml @@ -15,7 +15,7 @@ _core: id: views_block__content_by_author_block_author theme: octavia region: content -weight: 12 +weight: -10 provider: null plugin: 'views_block:content_by_author-block_author' settings: diff --git a/config/block.block.views_block__related_content_block_related_content.yml b/config/block.block.views_block__related_content_block_related_content.yml index 1d27bd3..19c784f 100644 --- a/config/block.block.views_block__related_content_block_related_content.yml +++ b/config/block.block.views_block__related_content_block_related_content.yml @@ -15,7 +15,7 @@ _core: id: views_block__related_content_block_related_content theme: octavia region: content -weight: 10 +weight: -11 provider: null plugin: 'views_block:related_content-block_related_content' settings: diff --git a/config/block.block.views_block__resource_block_promoted.yml b/config/block.block.views_block__resource_block_promoted.yml index 36832e2..7ee6e5d 100644 --- a/config/block.block.views_block__resource_block_promoted.yml +++ b/config/block.block.views_block__resource_block_promoted.yml @@ -15,7 +15,7 @@ _core: id: views_block__resource_block_promoted theme: octavia region: content -weight: 5 +weight: -13 provider: null plugin: 'views_block:resource-block_promoted' settings: diff --git a/config/views.view.article.yml b/config/views.view.article.yml index 9814385..a3d4d44 100644 --- a/config/views.view.article.yml +++ b/config/views.view.article.yml @@ -221,7 +221,7 @@ display: type: normal title: News description: 'Keep up to date.' - weight: -49 + weight: -48 expanded: false menu_name: main parent: 'menu_link_content:3f594be0-bb0f-4b30-923e-e7984983a0fd' diff --git a/config/views.view.people.yml b/config/views.view.people.yml index 32221e0..a0e6130 100644 --- a/config/views.view.people.yml +++ b/config/views.view.people.yml @@ -283,7 +283,7 @@ display: type: normal title: 'People (not used)' description: '' - weight: -42 + weight: -41 enabled: false expanded: false menu_name: main diff --git a/config/views.view.resource.yml b/config/views.view.resource.yml index 2098c4d..2204ff6 100644 --- a/config/views.view.resource.yml +++ b/config/views.view.resource.yml @@ -264,7 +264,8 @@ display: type: normal title: Resources description: 'Get connected with our resources.' - weight: -48 + weight: -47 + enabled: true expanded: false menu_name: main parent: 'menu_link_content:3f594be0-bb0f-4b30-923e-e7984983a0fd' From eb77a2cef6675a5228637ac9781781064e356a63 Mon Sep 17 00:00:00 2001 From: Keegan Rankin Date: Thu, 15 Feb 2024 16:03:48 -0800 Subject: [PATCH 2/2] Update lock file --- composer.lock | 133 ++++++++++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 57 deletions(-) diff --git a/composer.lock b/composer.lock index b11ab6e..d5661ba 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "abraham/twitteroauth", - "version": "6.2.0", + "version": "7.0.0", "source": { "type": "git", "url": "https://github.com/abraham/twitteroauth.git", - "reference": "e6fc2e0c30371ce68427d547bdeb19725868db30" + "reference": "a8622680f954d0c4f54fd80bedebe00c756ed7aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/abraham/twitteroauth/zipball/e6fc2e0c30371ce68427d547bdeb19725868db30", - "reference": "e6fc2e0c30371ce68427d547bdeb19725868db30", + "url": "https://api.github.com/repos/abraham/twitteroauth/zipball/a8622680f954d0c4f54fd80bedebe00c756ed7aa", + "reference": "a8622680f954d0c4f54fd80bedebe00c756ed7aa", "shasum": "" }, "require": { @@ -66,7 +66,7 @@ "issues": "https://github.com/abraham/twitteroauth/issues", "source": "https://github.com/abraham/twitteroauth" }, - "time": "2023-10-28T20:17:00+00:00" + "time": "2024-02-11T18:58:08+00:00" }, { "name": "agaric/oxford-comma", @@ -2984,7 +2984,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/bulma.git", - "reference": "2966e12e3f9a21b7139d75c32d548ec143406f8f" + "reference": "1899b7afcb023655cdc8d29d1eacd12989ea1403" }, "require": { "drupal/core": "^9.2 || ^10" @@ -2996,7 +2996,7 @@ }, "drupal": { "version": "3.0.x-dev", - "datestamp": "1698176820", + "datestamp": "1707419765", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -3012,6 +3012,10 @@ "name": "lelkneralfaro", "homepage": "https://www.drupal.org/user/3577260" }, + { + "name": "MegaKeegMan", + "homepage": "https://www.drupal.org/user/3620027" + }, { "name": "mlncn", "homepage": "https://www.drupal.org/user/64383" @@ -4827,16 +4831,16 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "10.2.2", + "version": "10.2.3", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "97bd91856535a354e9b1b815f0957893e26b6622" + "reference": "63effa1bc644e80a269e8b4415e627491d26fd3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/97bd91856535a354e9b1b815f0957893e26b6622", - "reference": "97bd91856535a354e9b1b815f0957893e26b6622", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/63effa1bc644e80a269e8b4415e627491d26fd3f", + "reference": "63effa1bc644e80a269e8b4415e627491d26fd3f", "shasum": "" }, "require": { @@ -4871,9 +4875,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.2" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.3" }, - "time": "2023-11-15T23:23:28+00:00" + "time": "2024-01-26T14:59:30+00:00" }, { "name": "drupal/core-recommended", @@ -7525,17 +7529,17 @@ }, { "name": "drupal/ds", - "version": "3.18.0", + "version": "3.19.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ds.git", - "reference": "8.x-3.18" + "reference": "8.x-3.19" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ds-8.x-3.18.zip", - "reference": "8.x-3.18", - "shasum": "1e2a8f48e48df54b3663c5aa58a1560e64b7b292" + "url": "https://ftp.drupal.org/files/projects/ds-8.x-3.19.zip", + "reference": "8.x-3.19", + "shasum": "7a1a4ded193ad8489c123a2f20ca2c7908c65eaa" }, "require": { "drupal/core": "^10" @@ -7547,8 +7551,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.18", - "datestamp": "1705507467", + "version": "8.x-3.19", + "datestamp": "1707499881", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7993,17 +7997,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.7", + "version": "2.1.8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.7" + "reference": "2.1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.7.zip", - "reference": "2.1.7", - "shasum": "4efcf4a9cff26cbd64d9b69be384d9347499e1a5" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.8.zip", + "reference": "2.1.8", + "shasum": "6ec91608cb6cd0db75a9a9bd8681616080cb8e76" }, "require": { "drupal/core": "^9 || ^10" @@ -8011,8 +8015,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.7", - "datestamp": "1703778081", + "version": "2.1.8", + "datestamp": "1707937463", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -13007,7 +13011,7 @@ "extra": { "drupal": { "version": "6.0.4", - "datestamp": "1707236656", + "datestamp": "1707330330", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -13770,6 +13774,10 @@ "name": "deekayen", "homepage": "https://www.drupal.org/user/972" }, + { + "name": "Kristen Pol", + "homepage": "https://www.drupal.org/user/8389" + }, { "name": "miglius", "homepage": "https://www.drupal.org/user/18741" @@ -15988,7 +15996,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/social_post_facebook.git", - "reference": "9d988d3aea0ce2f88b7c0c864517defa0b399707" + "reference": "6286f5bc5891c08665b5a14390b746634435e1f5" }, "require": { "agaric/php-facebook": "dev-main", @@ -16002,7 +16010,7 @@ }, "drupal": { "version": "3.0.x-dev", - "datestamp": "1695249488", + "datestamp": "1707335201", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -16035,6 +16043,10 @@ { "name": "mlncn", "homepage": "https://www.drupal.org/user/64383" + }, + { + "name": "wolcen", + "homepage": "https://www.drupal.org/user/3099655" } ], "description": "Social Post Facebook for Facebook", @@ -21527,16 +21539,16 @@ }, { "name": "phenx/php-svg-lib", - "version": "0.5.1", + "version": "0.5.2", "source": { "type": "git", "url": "https://github.com/dompdf/php-svg-lib.git", - "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456" + "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456", - "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456", + "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa", + "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa", "shasum": "" }, "require": { @@ -21567,9 +21579,9 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "support": { "issues": "https://github.com/dompdf/php-svg-lib/issues", - "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.1" + "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2" }, - "time": "2023-12-11T20:56:08+00:00" + "time": "2024-02-07T12:49:40+00:00" }, { "name": "phootwork/collection", @@ -22375,16 +22387,16 @@ }, { "name": "sabberworm/php-css-parser", - "version": "8.5.0", + "version": "v8.5.1", "source": { "type": "git", - "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0" + "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git", + "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", - "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", + "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152", + "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152", "shasum": "" }, "require": { @@ -22392,7 +22404,6 @@ "php": ">=5.6.20" }, "require-dev": { - "codacy/coverage": "^1.4.3", "phpunit/phpunit": "^5.7.27" }, "suggest": { @@ -22401,7 +22412,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.0.x-dev" + "dev-main": "9.0.x-dev" } }, "autoload": { @@ -22416,6 +22427,14 @@ "authors": [ { "name": "Raphael Schweikert" + }, + { + "name": "Oliver Klee", + "email": "github@oliverklee.de" + }, + { + "name": "Jake Hotson", + "email": "jake.github@qzdesign.co.uk" } ], "description": "Parser for CSS Files written in PHP", @@ -22426,10 +22445,10 @@ "stylesheet" ], "support": { - "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", - "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.5.0" + "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues", + "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1" }, - "time": "2024-02-01T00:40:08+00:00" + "time": "2024-02-15T16:41:13+00:00" }, { "name": "sebastian/diff", @@ -26386,16 +26405,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.6", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "ba8678f8cbea42cc41022c21751004eb677cf5a4" + "reference": "32f79fcf48c74532014248687ae3850581a22416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/ba8678f8cbea42cc41022c21751004eb677cf5a4", - "reference": "ba8678f8cbea42cc41022c21751004eb677cf5a4", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/32f79fcf48c74532014248687ae3850581a22416", + "reference": "32f79fcf48c74532014248687ae3850581a22416", "shasum": "" }, "require": { @@ -26470,7 +26489,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.6" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.7" }, "funding": [ { @@ -26486,20 +26505,20 @@ "type": "tidelift" } ], - "time": "2024-01-16T00:42:10+00:00" + "time": "2024-02-14T04:38:08+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.58", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "a23518379ec4defd9e47cbf81019526861623ec2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", + "reference": "a23518379ec4defd9e47cbf81019526861623ec2", "shasum": "" }, "require": { @@ -26548,7 +26567,7 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-02-12T20:02:57+00:00" }, { "name": "phpstan/phpstan-deprecation-rules",