diff --git a/composer.lock b/composer.lock index fca13a2e..a97375db 100644 --- a/composer.lock +++ b/composer.lock @@ -149,28 +149,28 @@ }, { "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26" + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/293975b465e0e709b571cbf0c957c6c0a7b9a2ac", + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac", "shasum": "" }, "require": { "phpcompatibility/php-compatibility": "^9.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "paragonie/random_compat": "dev-master", "paragonie/sodium_compat": "dev-master" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -200,22 +200,37 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie" }, - "time": "2022-10-25T01:46:02+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:30:46+00:00" }, { "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5" + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/01c1ff2704a58e46f0cb1ca9d06aee07b3589082", + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082", "shasum": "" }, "require": { @@ -223,10 +238,10 @@ "phpcompatibility/phpcompatibility-paragonie": "^1.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7" + "dealerdirect/phpcodesniffer-composer-installer": "^1.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -255,9 +270,24 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityWP/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" }, - "time": "2022-10-24T09:00:36+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:37:59+00:00" }, { "name": "phpcsstandards/phpcsextra", @@ -339,22 +369,22 @@ }, { "name": "phpcsstandards/phpcsutils", - "version": "1.0.9", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSUtils.git", - "reference": "908247bc65010c7b7541a9551e002db12e9dae70" + "reference": "c457da9dabb60eb7106dd5e3c05132b1a6539c6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/908247bc65010c7b7541a9551e002db12e9dae70", - "reference": "908247bc65010c7b7541a9551e002db12e9dae70", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/c457da9dabb60eb7106dd5e3c05132b1a6539c6a", + "reference": "c457da9dabb60eb7106dd5e3c05132b1a6539c6a", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0", "php": ">=5.4", - "squizlabs/php_codesniffer": "^3.8.0 || 4.0.x-dev@dev" + "squizlabs/php_codesniffer": "^3.9.0 || 4.0.x-dev@dev" }, "require-dev": { "ext-filter": "*", @@ -423,20 +453,20 @@ "type": "open_collective" } ], - "time": "2023-12-08T14:50:00+00:00" + "time": "2024-04-24T11:47:18+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.1", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -503,20 +533,20 @@ "type": "open_collective" } ], - "time": "2024-01-11T20:47:48+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -525,7 +555,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -554,7 +584,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -570,7 +600,7 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -654,16 +684,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0435a08f69125535336177c29d56af3abc1f69da" + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", - "reference": "0435a08f69125535336177c29d56af3abc1f69da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7", "shasum": "" }, "require": { @@ -719,7 +749,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.7" }, "funding": [ { @@ -735,20 +765,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:53:30+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "wp-coding-standards/wpcs", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", - "reference": "b4caf9689f1a0e4a4c632679a44e638c1c67aff1" + "reference": "9333efcbff231f10dfd9c56bb7b65818b4733ca7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/b4caf9689f1a0e4a4c632679a44e638c1c67aff1", - "reference": "b4caf9689f1a0e4a4c632679a44e638c1c67aff1", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/9333efcbff231f10dfd9c56bb7b65818b4733ca7", + "reference": "9333efcbff231f10dfd9c56bb7b65818b4733ca7", "shasum": "" }, "require": { @@ -757,16 +787,16 @@ "ext-tokenizer": "*", "ext-xmlreader": "*", "php": ">=5.4", - "phpcsstandards/phpcsextra": "^1.1.0", - "phpcsstandards/phpcsutils": "^1.0.8", - "squizlabs/php_codesniffer": "^3.7.2" + "phpcsstandards/phpcsextra": "^1.2.1", + "phpcsstandards/phpcsutils": "^1.0.10", + "squizlabs/php_codesniffer": "^3.9.0" }, "require-dev": { "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.0", "phpcsstandards/phpcsdevtools": "^1.2.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "suggest": { "ext-iconv": "For improved results", @@ -797,11 +827,11 @@ }, "funding": [ { - "url": "https://opencollective.com/thewpcc/contribute/wp-php-63406", + "url": "https://opencollective.com/php_codesniffer", "type": "custom" } ], - "time": "2023-09-14T07:06:09+00:00" + "time": "2024-03-25T16:39:00+00:00" } ], "aliases": [], @@ -813,5 +843,5 @@ "php": ">=7.4" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/public/css/blocks/core/navigation-submenu.asset.php b/public/css/blocks/core/navigation-submenu.asset.php index da49d170..3e65b9fb 100644 --- a/public/css/blocks/core/navigation-submenu.asset.php +++ b/public/css/blocks/core/navigation-submenu.asset.php @@ -1 +1 @@ - array(), 'version' => '92da88d02afa523cfe25'); + array(), 'version' => '8a7da49046cc1e353945'); diff --git a/public/css/blocks/core/navigation-submenu.css b/public/css/blocks/core/navigation-submenu.css index 0c340c5d..c67166d5 100644 --- a/public/css/blocks/core/navigation-submenu.css +++ b/public/css/blocks/core/navigation-submenu.css @@ -1 +1 @@ -.wp-block-navigation .has-child .wp-block-navigation-submenu__toggle[aria-expanded=true]~.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.has-child-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.is-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child:not(.open-on-click):hover>.wp-block-navigation__submenu-container{min-width:var(--wp--custom--min-width,16rem)!important}.wp-block-navigation__submenu-container .has-child .wp-block-navigation__submenu-icon{margin-left:1rem;margin-right:1rem}.wp-block-navigation__submenu-container .wp-block-navigation-item{border-radius:inherit;transition:all .5s ease-in-out}.wp-block-navigation-submenu .wp-block-navigation-item.open-on-click .wp-block-navigation-submenu__toggle{padding:var(--wp--custom--submenu-toggle--padding,var(--wp--preset--spacing--minus-2) var(--wp--preset--spacing--base))}.wp-block-navigation-submenu .wp-block-navigation-item:focus,.wp-block-navigation-submenu .wp-block-navigation-item:hover{background:var(--wp--custom--submenu-item--hover-background,var(--wp--preset--color--neutral-50))}nav.wp-block-navigation .is-menu-open .wp-block-navigation-submenu .wp-block-navigation__submenu-container{background:transparent;border:none;border-radius:0;box-shadow:none;padding:0} +.wp-block-navigation-submenu .wp-block-navigation__submenu-container{padding:var(--wp--custom--padding,var(--wp--preset--spacing--base))}nav.wp-block-navigation .wp-block-navigation-submenu .wp-block-navigation__submenu-container,nav.wp-block-navigation.wp-block-navigation .wp-block-navigation__responsive-container.is-menu-open{background:var(--wp--custom--background,var(--wp--preset--color--base));color:var(--wp--custom--color,var(--wp--preset--color--contrast))}.wp-block-navigation .has-child .wp-block-navigation-submenu__toggle[aria-expanded=true]~.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.has-child-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child.is-selected>.wp-block-navigation__submenu-container,.wp-block-navigation .has-child:not(.open-on-click):hover>.wp-block-navigation__submenu-container{min-width:var(--wp--custom--min-width,16rem)!important}.wp-block-navigation__submenu-container .has-child .wp-block-navigation__submenu-icon{margin-left:1rem;margin-right:1rem}.wp-block-navigation__submenu-container .wp-block-navigation-item{border-radius:inherit;transition:all .5s ease-in-out}.wp-block-navigation-submenu .wp-block-navigation-item.open-on-click .wp-block-navigation-submenu__toggle{padding:var(--wp--custom--submenu-toggle--padding,var(--wp--preset--spacing--minus-2) var(--wp--preset--spacing--base))}.wp-block-navigation-submenu .wp-block-navigation-item:focus,.wp-block-navigation-submenu .wp-block-navigation-item:hover{background:var(--wp--custom--submenu-item--hover-background,var(--wp--preset--color--neutral-50))}nav.wp-block-navigation .is-menu-open .wp-block-navigation-submenu .wp-block-navigation__submenu-container{background:transparent;border:none;border-radius:0;box-shadow:none;padding:0} diff --git a/resources/scss/blocks/core/navigation-submenu.scss b/resources/scss/blocks/core/navigation-submenu.scss index 375d8fa4..994f9947 100644 --- a/resources/scss/blocks/core/navigation-submenu.scss +++ b/resources/scss/blocks/core/navigation-submenu.scss @@ -5,6 +5,30 @@ /// @link https://github.com/x3p0-dev/x3p0-ideas //// +// ----------------------------------------------------------------------------- +// Block customizations. +// ----------------------------------------------------------------------------- + +/// +/// Gutenberg 18.1 broke `theme.json`-based styles for nav sub-menus by reducing +/// specificity of global style rules. Therefore, we needed to move some CSS to +/// custom presets. +/// +/// @link https://github.com/x3p0-dev/x3p0-ideas/issues/9 +/// @link https://github.com/WordPress/gutenberg/pull/60106 +/// @link https://github.com/WordPress/gutenberg/pull/59457 +/// +.wp-block-navigation-submenu .wp-block-navigation__submenu-container { + padding: var(--wp--custom--padding, var(--wp--preset--spacing--base)); +} + +nav.wp-block-navigation .wp-block-navigation-submenu .wp-block-navigation__submenu-container, +nav.wp-block-navigation.wp-block-navigation .wp-block-navigation__responsive-container.is-menu-open { + color: var(--wp--custom--color, var(--wp--preset--color--contrast)); + background: var(--wp--custom--background, var(--wp--preset--color--base)); +} + + // ----------------------------------------------------------------------------- // Block customizations. // ----------------------------------------------------------------------------- diff --git a/styles/chestnut-rose.json b/styles/chestnut-rose.json index db49ec68..53bef1d0 100644 --- a/styles/chestnut-rose.json +++ b/styles/chestnut-rose.json @@ -30,6 +30,12 @@ } } }, + "core/navigation-submenu": { + "custom": { + "color": "var:preset|color|contrast", + "background": "var:preset|color|neutral-50" + } + }, "core/post-comments-form": { "custom": { "commentNotes": { diff --git a/styles/extant.json b/styles/extant.json index 1656d47f..0de01501 100644 --- a/styles/extant.json +++ b/styles/extant.json @@ -53,6 +53,8 @@ }, "core/navigation-submenu": { "custom": { + "color": "var:preset|color|neutral-50", + "background": "var:preset|color|neutral-950", "minWidth": "18rem" } }, diff --git a/styles/saga.json b/styles/saga.json index 615ce1df..0c8b1fdc 100644 --- a/styles/saga.json +++ b/styles/saga.json @@ -59,6 +59,12 @@ "borderWidth": "3px 0 0" } } + }, + "core/navigation-submenu": { + "custom": { + "background": "var:preset|color|neutral-950", + "color": "var:preset|color|base" + } } }, "custom": { diff --git a/styles/th5.json b/styles/th5.json index d1f7794f..a380d121 100644 --- a/styles/th5.json +++ b/styles/th5.json @@ -65,6 +65,12 @@ } } }, + "core/navigation-submenu": { + "custom": { + "color": "var:preset|color|neutral-950", + "background": "var:preset|color|neutral-100" + } + }, "core/post-comments-form": { "custom": { "commentNotes": { diff --git a/styles/thunderbird.json b/styles/thunderbird.json index 285260c2..4525fdaf 100644 --- a/styles/thunderbird.json +++ b/styles/thunderbird.json @@ -55,6 +55,11 @@ } } }, + "core/navigation-submenu": { + "custom": { + "background": "var:preset|color|white" + } + }, "core/paragraph": { "custom": { "dropCap": { diff --git a/styles/unravel.json b/styles/unravel.json index 456e6ffb..6f0c7e45 100644 --- a/styles/unravel.json +++ b/styles/unravel.json @@ -44,6 +44,12 @@ } } }, + "core/navigation-submenu": { + "custom": { + "color": "var:preset|color|neutral-950", + "background": "var:preset|color|neutral-50" + } + }, "core/paragraph": { "custom": { "dropCap": { @@ -441,14 +447,6 @@ "background": "var:preset|color|neutral-50" }, "shadow": "var:preset|shadow|md", - "spacing": { - "padding": { - "top": "var:preset|spacing|base", - "bottom": "var:preset|spacing|base", - "left": "var:preset|spacing|base", - "right": "var:preset|spacing|base" - } - }, "typography": { "fontSize": "inherit" }, diff --git a/theme.json b/theme.json index a2fe9cbb..61a41d62 100644 --- a/theme.json +++ b/theme.json @@ -120,6 +120,13 @@ } } }, + "core/navigation-submenu": { + "custom": { + "color": "var:preset|color|contrast", + "background": "var:preset|color|base", + "padding": "var:wp|preset|spacing|base" + } + }, "core/post-comments-form": { "custom": { "commentNotes": {