From 3f1032ce578675dfd69dd40bd69ce79211d94a54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 02:27:28 +0000 Subject: [PATCH 01/39] chore(deps-dev): bump prettier from 3.2.5 to 3.3.0 Bumps [prettier](https://github.com/prettier/prettier) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.2.5...3.3.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74d19670..523b9f90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "lint-staged": "^15.2.5", "newspack-scripts": "^5.4.0", "postcss-scss": "^4.0.9", - "prettier": "^3.2.5", + "prettier": "^3.3.0", "stylelint": "^16.6.0" } }, @@ -27800,9 +27800,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", + "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -55284,9 +55284,9 @@ "dev": true }, "prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", + "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 99ecee88..0d77ae72 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "lint-staged": "^15.2.5", "newspack-scripts": "^5.4.0", "postcss-scss": "^4.0.9", - "prettier": "^3.2.5", + "prettier": "^3.3.0", "stylelint": "^16.6.0" } } From 09568e7d9036dd8d73a5579ba01855b93fbb8781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 02:31:45 +0000 Subject: [PATCH 02/39] chore(deps-dev): bump stylelint from 16.6.0 to 16.6.1 Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.6.0 to 16.6.1. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.6.0...16.6.1) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 679 +++------------------------------------------- package.json | 2 +- 2 files changed, 38 insertions(+), 643 deletions(-) diff --git a/package-lock.json b/package-lock.json index 523b9f90..a59d33c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "newspack-scripts": "^5.4.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.0", - "stylelint": "^16.6.0" + "stylelint": "^16.6.1" } }, "node_modules/@adobe/css-tools": { @@ -3321,96 +3321,6 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -5039,16 +4949,6 @@ "@octokit/openapi-types": "^16.0.0" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@pnpm/config.env-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", @@ -10943,12 +10843,6 @@ "node": ">=4" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, "node_modules/ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -12654,9 +12548,9 @@ } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/for-each": { @@ -12677,34 +12571,6 @@ "node": ">=0.10.0" } }, - "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -14853,24 +14719,6 @@ "node": ">=8" } }, - "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/java-properties": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz", @@ -25867,40 +25715,6 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", - "dev": true, - "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", - "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -31135,36 +30949,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/string-width/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -31274,19 +31058,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", @@ -31418,9 +31189,9 @@ } }, "node_modules/stylelint": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.0.tgz", - "integrity": "sha512-vjWYlDEgOS3Z/IcXagQwi8PFJyPro1DxBYOnTML1PAqnrYUHs8owleGStv20sgt0OhW8r9zZm6MK7IT2+l2B6A==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz", + "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==", "dev": true, "funding": [ { @@ -31446,7 +31217,7 @@ "debug": "^4.3.4", "fast-glob": "^3.3.2", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^8.0.0", + "file-entry-cache": "^9.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -31457,7 +31228,7 @@ "known-css-properties": "^0.31.0", "mathml-tag-names": "^2.1.3", "meow": "^13.2.0", - "micromatch": "^4.0.5", + "micromatch": "^4.0.7", "normalize-path": "^3.0.0", "picocolors": "^1.0.1", "postcss": "^8.4.38", @@ -31508,21 +31279,6 @@ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", "dev": true }, - "node_modules/stylelint/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/stylelint/node_modules/brace-expansion/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, "node_modules/stylelint/node_modules/cosmiconfig": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", @@ -31556,51 +31312,28 @@ "dev": true }, "node_modules/stylelint/node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz", + "integrity": "sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==", "dev": true, "dependencies": { - "flat-cache": "^4.0.0" + "flat-cache": "^5.0.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=18" } }, "node_modules/stylelint/node_modules/flat-cache": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.0.tgz", - "integrity": "sha512-EryKbCE/wxpxKniQlyas6PY1I9vwtF3uCBweX+N8KYTCn3Y12RTGtQAJ/bd5pl7kxUAc8v/R3Ake/N17OZiFqA==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4", - "rimraf": "^5.0.5" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/stylelint/node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz", + "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==", "dev": true, "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" + "flatted": "^3.3.1", + "keyv": "^4.5.4" }, "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=18" } }, "node_modules/stylelint/node_modules/global-modules": { @@ -31650,30 +31383,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/stylelint/node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/stylelint/node_modules/postcss-safe-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz", @@ -31709,24 +31418,6 @@ "node": ">=8" } }, - "node_modules/stylelint/node_modules/rimraf": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", - "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", - "dev": true, - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/stylelint/node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -33752,53 +33443,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/wrap-ansi/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -36397,65 +36041,6 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, - "@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "requires": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - }, - "wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "requires": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - } - } - } - }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -37783,13 +37368,6 @@ "@octokit/openapi-types": "^16.0.0" } }, - "@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "optional": true - }, "@pnpm/config.env-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", @@ -42413,12 +41991,6 @@ } } }, - "eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -43743,9 +43315,9 @@ } }, "flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "for-each": { @@ -43763,24 +43335,6 @@ "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", "dev": true }, - "foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "dependencies": { - "signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true - } - } - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -45407,16 +44961,6 @@ "istanbul-lib-report": "^3.0.0" } }, - "jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, - "requires": { - "@isaacs/cliui": "^8.0.2", - "@pkgjs/parseargs": "^0.11.0" - } - }, "java-properties": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz", @@ -53832,30 +53376,6 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, - "path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", - "dev": true, - "requires": { - "lru-cache": "^9.1.1 || ^10.0.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", - "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", - "dev": true - }, - "minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true - } - } - }, "path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -57949,31 +57469,6 @@ } } }, - "string-width-cjs": { - "version": "npm:string-width@4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - } - } - }, "string.prototype.matchall": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", @@ -58032,15 +57527,6 @@ "ansi-regex": "^5.0.1" } }, - "strip-ansi-cjs": { - "version": "npm:strip-ansi@6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, "strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", @@ -58137,9 +57623,9 @@ } }, "stylelint": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.0.tgz", - "integrity": "sha512-vjWYlDEgOS3Z/IcXagQwi8PFJyPro1DxBYOnTML1PAqnrYUHs8owleGStv20sgt0OhW8r9zZm6MK7IT2+l2B6A==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz", + "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==", "dev": true, "requires": { "@csstools/css-parser-algorithms": "^2.6.3", @@ -58155,7 +57641,7 @@ "debug": "^4.3.4", "fast-glob": "^3.3.2", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^8.0.0", + "file-entry-cache": "^9.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -58166,7 +57652,7 @@ "known-css-properties": "^0.31.0", "mathml-tag-names": "^2.1.3", "meow": "^13.2.0", - "micromatch": "^4.0.5", + "micromatch": "^4.0.7", "normalize-path": "^3.0.0", "picocolors": "^1.0.1", "postcss": "^8.4.38", @@ -58196,23 +57682,6 @@ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", "dev": true }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - } - } - }, "cosmiconfig": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", @@ -58232,36 +57701,22 @@ "dev": true }, "file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz", + "integrity": "sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==", "dev": true, "requires": { - "flat-cache": "^4.0.0" + "flat-cache": "^5.0.0" } }, "flat-cache": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.0.tgz", - "integrity": "sha512-EryKbCE/wxpxKniQlyas6PY1I9vwtF3uCBweX+N8KYTCn3Y12RTGtQAJ/bd5pl7kxUAc8v/R3Ake/N17OZiFqA==", - "dev": true, - "requires": { - "flatted": "^3.2.9", - "keyv": "^4.5.4", - "rimraf": "^5.0.5" - } - }, - "glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz", + "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==", "dev": true, "requires": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" + "flatted": "^3.3.1", + "keyv": "^4.5.4" } }, "global-modules": { @@ -58296,21 +57751,6 @@ "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", "dev": true }, - "minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true - }, "postcss-safe-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz", @@ -58324,15 +57764,6 @@ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true }, - "rimraf": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", - "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", - "dev": true, - "requires": { - "glob": "^10.3.7" - } - }, "signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -59896,42 +59327,6 @@ } } }, - "wrap-ansi-cjs": { - "version": "npm:wrap-ansi@7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - } - } - }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index 0d77ae72..8105f944 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,6 @@ "newspack-scripts": "^5.4.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.0", - "stylelint": "^16.6.0" + "stylelint": "^16.6.1" } } From ec1842b8895f54d94a1b894672b5897ef4a0e232 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Fri, 7 Jun 2024 12:22:47 +0100 Subject: [PATCH 03/39] feat: add blank with footer page template (#172) --- src/scss/_base.scss | 9 ++++++++- templates/page/blank-footer.html | 7 +++++++ templates/page/blank.html | 2 +- theme.json | 9 ++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 templates/page/blank-footer.html diff --git a/src/scss/_base.scss b/src/scss/_base.scss index 3d99c58e..4eefe5e0 100644 --- a/src/scss/_base.scss +++ b/src/scss/_base.scss @@ -21,7 +21,7 @@ figcaption { color: var(--wp--preset--color--contrast-3); font-size: var(--wp--preset--font-size--x-small); line-height: var(--wp--custom--line-height--x-small); - margin: var(--wp--preset--spacing--20) 0 0; + margin: var(--wp--preset--spacing--20) 0 0; a { color: inherit; @@ -81,6 +81,13 @@ ul, ol { mask: url('../../src/images/icon-search.svg') 0 0 no-repeat; } +// Footer +footer { + &.wp-block-template-part { + margin-top: 0; + } +} + // Powered By .powered-by { a { diff --git a/templates/page/blank-footer.html b/templates/page/blank-footer.html new file mode 100644 index 00000000..5a567c37 --- /dev/null +++ b/templates/page/blank-footer.html @@ -0,0 +1,7 @@ + +
+ +
+ + + diff --git a/templates/page/blank.html b/templates/page/blank.html index 207bbccb..f9cffb8b 100644 --- a/templates/page/blank.html +++ b/templates/page/blank.html @@ -2,4 +2,4 @@
- \ No newline at end of file + diff --git a/theme.json b/theme.json index c184d106..b57be1bb 100644 --- a/theme.json +++ b/theme.json @@ -943,6 +943,13 @@ ], "title": "Page - Blank" }, + { + "name": "page/blank-footer", + "postTypes": [ + "page" + ], + "title": "Page - Blank with Footer" + }, { "name": "single/large-image", "postTypes": [ @@ -987,4 +994,4 @@ ], "version": 2, "$schema": "https://schemas.wp.org/wp/6.2/theme.json" -} \ No newline at end of file +} From 9ac025fd293050fda00bd2f3a46fd4c588a145fa Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Fri, 7 Jun 2024 12:23:10 +0100 Subject: [PATCH 04/39] feat(column-block): add rounded block style (#170) --- includes/class-core.php | 16 ++++++++++++++++ src/scss/block-styles/_block-styles.scss | 1 + src/scss/block-styles/_column-styles.scss | 5 +++++ 3 files changed, 22 insertions(+) create mode 100644 src/scss/block-styles/_column-styles.scss diff --git a/includes/class-core.php b/includes/class-core.php index b6c96721..89162ec1 100644 --- a/includes/class-core.php +++ b/includes/class-core.php @@ -43,6 +43,7 @@ public function __construct() { \add_action( 'enqueue_block_editor_assets', [ __CLASS__, 'editor_scripts' ] ); \add_filter( 'block_type_metadata', [ __CLASS__, 'block_variations' ] ); \add_action( 'init', [ __CLASS__, 'block_pattern_categories' ] ); + \add_action( 'init', [ __CLASS__, 'register_block_styles' ] ); } /** @@ -148,6 +149,21 @@ public static function block_pattern_categories() { ) ); } + + /** + * Register new block styles. + * + * @since Newspack Block Theme 1.0 + */ + public static function register_block_styles() { + register_block_style( + 'core/column', + array( + 'name' => 'rounded', + 'label' => __( 'Rounded', 'newspack-block-theme' ), + ) + ); + } } Core::instance(); diff --git a/src/scss/block-styles/_block-styles.scss b/src/scss/block-styles/_block-styles.scss index 72a25492..cce01e9b 100644 --- a/src/scss/block-styles/_block-styles.scss +++ b/src/scss/block-styles/_block-styles.scss @@ -1,2 +1,3 @@ +@import url('./_column-styles.scss'); @import url('./_navigation-styles.scss'); @import url('./_separator-styles.scss'); diff --git a/src/scss/block-styles/_column-styles.scss b/src/scss/block-styles/_column-styles.scss new file mode 100644 index 00000000..fd0f9166 --- /dev/null +++ b/src/scss/block-styles/_column-styles.scss @@ -0,0 +1,5 @@ +.wp-block-column { + &.is-style-rounded { + border-radius: var( --wp--custom--border--radius-medium ); + } +} From 309dd6d26023c1ffaf16093183570eae8bb6db2e Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Fri, 7 Jun 2024 12:30:06 +0100 Subject: [PATCH 05/39] feat(list-block): add checked block style (#171) --- includes/class-core.php | 8 ++ src/scss/_css-variables.scss | 10 +- src/scss/block-styles/_block-styles.scss | 1 + src/scss/block-styles/_list-styles.scss | 119 +++++++++++++++++++++++ 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 src/scss/block-styles/_list-styles.scss diff --git a/includes/class-core.php b/includes/class-core.php index 89162ec1..4b9ff8fd 100644 --- a/includes/class-core.php +++ b/includes/class-core.php @@ -163,6 +163,14 @@ public static function register_block_styles() { 'label' => __( 'Rounded', 'newspack-block-theme' ), ) ); + + register_block_style( + 'core/list', + array( + 'name' => 'checked', + 'label' => __( 'Checked', 'newspack-block-theme' ), + ) + ); } } diff --git a/src/scss/_css-variables.scss b/src/scss/_css-variables.scss index ec6298f8..d8d3a0a5 100644 --- a/src/scss/_css-variables.scss +++ b/src/scss/_css-variables.scss @@ -38,4 +38,12 @@ .has-xxxx-large-font-size { line-height: var(--wp--custom--line-height--xxxx-large); -} \ No newline at end of file +} + +.has-xxxxx-large-font-size { + line-height: var(--wp--custom--line-height--xxxxx-large); +} + +.has-xxxxxx-large-font-size { + line-height: var(--wp--custom--line-height--xxxxxx-large); +} diff --git a/src/scss/block-styles/_block-styles.scss b/src/scss/block-styles/_block-styles.scss index cce01e9b..e5b8dfc7 100644 --- a/src/scss/block-styles/_block-styles.scss +++ b/src/scss/block-styles/_block-styles.scss @@ -1,3 +1,4 @@ @import url('./_column-styles.scss'); +@import url('./_list-styles.scss'); @import url('./_navigation-styles.scss'); @import url('./_separator-styles.scss'); diff --git a/src/scss/block-styles/_list-styles.scss b/src/scss/block-styles/_list-styles.scss new file mode 100644 index 00000000..e8a07f3e --- /dev/null +++ b/src/scss/block-styles/_list-styles.scss @@ -0,0 +1,119 @@ +ul { + &.is-style-checked { + list-style-type: none; + padding-left: calc( var( --wp--preset--spacing--40 ) + 0.25em ); + + li { + position: relative; + &::before { + background: currentcolor; + clip-path: polygon( 69.5833% 29.5834%, 43.3333% 65%, 29.5833% 54.5834%, 25.8333% 59.5834%, 44.5833% 73.75%, 74.5833% 33.3334%, 69.5833% 29.5834% ); + content: ''; + display: block; + height: var( --wp--preset--spacing--40 ); + left: calc( -1 * ( var( --wp--preset--spacing--40 ) + 0.25em ) ); + position: absolute; + top: calc( ( 1em * var( --wp--custom--line-height--medium ) - var( --wp--preset--spacing--40 ) ) / 2 ); + width: var( --wp--preset--spacing--40 ); + } + } + + .has-xx-small-font-size &, + &.has-xx-small-font-size, + .has-x-small-font-size &, + &.has-x-small-font-size { + padding-left: calc( var( --wp--preset--spacing--30 ) + 0.25em ); + + li::before { + height: var( --wp--preset--spacing--30 ); + left: calc( -1 * ( var( --wp--preset--spacing--30 ) + 0.25em ) ); + top: calc( ( 1em * var( --wp--custom--line-height--xx-small ) - var( --wp--preset--spacing--30 ) ) / 2 ); + width: var( --wp--preset--spacing--30 ); + } + } + + .has-x-small-font-size &, + &.has-x-small-font-size { + li::before { + top: calc( ( 1em * var( --wp--custom--line-height--x-small ) - var( --wp--preset--spacing--30 ) ) / 2 ); + } + } + + .has-small-font-size &, + &.has-small-font-size { + li::before { + top: calc( ( 1em * var( --wp--custom--line-height--small ) - var( --wp--preset--spacing--40 ) ) / 2 ); + } + } + + .has-large-font-size &, + &.has-large-font-size { + li::before { + top: calc( ( 1em * var( --wp--custom--line-height--large ) - var( --wp--preset--spacing--40 ) ) / 2 ); + } + } + + .has-x-large-font-size &, + &.has-x-large-font-size, + .has-xx-large-font-size &, + &.has-xx-large-font-size { + padding-left: calc( var( --wp--preset--spacing--50 ) + 0.25em ); + + li::before { + height: var( --wp--preset--spacing--50 ); + left: calc( -1 * ( var( --wp--preset--spacing--50 ) + 0.25em ) ); + top: calc( ( 1em * var( --wp--custom--line-height--x-large ) - var( --wp--preset--spacing--50 ) ) / 2 ); + width: var( --wp--preset--spacing--50 ); + } + } + + .has-xx-large-font-size &, + &.has-xx-large-font-size { + li::before { + top: calc( ( 1em * var( --wp--custom--line-height--xx-large ) - var( --wp--preset--spacing--40 ) ) / 2 ); + } + } + + .has-xxx-large-font-size &, + &.has-xxx-large-font-size, + .has-xxxx-large-font-size &, + &.has-xxxx-large-font-size { + padding-left: calc( var( --wp--preset--spacing--50 ) * 1.5 + 0.25em ); + + li::before { + height: calc( var( --wp--preset--spacing--50 ) * 1.5 ); + left: calc( -1 * ( var( --wp--preset--spacing--50 ) * 1.5 + 0.25em ) ); + top: calc( ( 1em * var( --wp--custom--line-height--xxx-large ) - var( --wp--preset--spacing--50 ) * 1.5 ) / 2 ); + width: calc( var( --wp--preset--spacing--50 ) * 1.5 ); + } + } + + .has-xxxx-large-font-size &, + &.has-xxxx-large-font-size { + li::before { + top: calc( ( 1em * var( --wp--custom--line-height--xxxx-large ) - var( --wp--preset--spacing--50 ) * 1.5 ) / 2 ); + } + } + + .has-xxxxx-large-font-size &, + &.has-xxxxx-large-font-size, + .has-xxxxxx-large-font-size &, + &.has-xxxxxx-large-font-size { + padding-left: calc( var( --wp--preset--spacing--50 ) * 2 + 0.25em ); + + li::before { + height: calc( var( --wp--preset--spacing--50 ) * 2 ); + left: calc( -1 * ( var( --wp--preset--spacing--50 ) * 2 + 0.25em ) ); + top: calc( ( 1em * var( --wp--custom--line-height--xxxxx-large ) - var( --wp--preset--spacing--50 ) * 2 ) / 2 ); + width: calc( var( --wp--preset--spacing--50 ) * 2 ); + } + } + + .has-xxxxxx-large-font-size &, + &.has-xxxxxx-large-font-size { + li::before { + top: calc( ( 1em * var( --wp--custom--line-height--xxxxxx-large ) - var( --wp--preset--spacing--50 ) * 2 ) / 2 ); + } + } + } +} From 50c492410b2baa9579d626812601c61c87fcd53a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 02:50:34 +0000 Subject: [PATCH 06/39] chore(deps-dev): bump prettier from 3.3.0 to 3.3.1 Bumps [prettier](https://github.com/prettier/prettier) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.3.0...3.3.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index a59d33c2..696094f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "lint-staged": "^15.2.5", "newspack-scripts": "^5.4.0", "postcss-scss": "^4.0.9", - "prettier": "^3.3.0", + "prettier": "^3.3.1", "stylelint": "^16.6.1" } }, @@ -27614,9 +27614,9 @@ } }, "node_modules/prettier": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", - "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", + "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -54804,9 +54804,9 @@ "dev": true }, "prettier": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", - "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", + "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 8105f944..818fb3c6 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "lint-staged": "^15.2.5", "newspack-scripts": "^5.4.0", "postcss-scss": "^4.0.9", - "prettier": "^3.3.0", + "prettier": "^3.3.1", "stylelint": "^16.6.1" } } From 4aba83ad91d3bad78385a0b09879d40d4657c914 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 02:55:00 +0000 Subject: [PATCH 07/39] chore(deps-dev): bump newspack-scripts from 5.4.0 to 5.5.0 Bumps [newspack-scripts](https://github.com/Automattic/newspack-scripts) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/Automattic/newspack-scripts/releases) - [Commits](https://github.com/Automattic/newspack-scripts/compare/v5.4.0...v5.5.0) --- updated-dependencies: - dependency-name: newspack-scripts dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 696094f8..248c8034 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "eslint": "^7.32.0", "ignore-emit-webpack-plugin": "^2.0.6", "lint-staged": "^15.2.5", - "newspack-scripts": "^5.4.0", + "newspack-scripts": "^5.5.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.1", "stylelint": "^16.6.1" @@ -20133,9 +20133,9 @@ "dev": true }, "node_modules/newspack-scripts": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-5.4.0.tgz", - "integrity": "sha512-ddpmHl7wyQnzHzgwNRbqDnYmNO+Jz05q5q0YUa2LLzSNlORQWnYYNWO9OgcufB6N98sD71Bz/E3jwQM/wwVqeA==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-5.5.0.tgz", + "integrity": "sha512-LyRrx8omcdXR1RuU9OpcsNoWw8GmPNdYxfjFBBbC4s7KDHPRptt5m+3RCzzDjyu2on64yuTK4m1lHlwnSog4Rw==", "dev": true, "dependencies": { "@automattic/calypso-build": "^10.0.0", @@ -49227,9 +49227,9 @@ "dev": true }, "newspack-scripts": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-5.4.0.tgz", - "integrity": "sha512-ddpmHl7wyQnzHzgwNRbqDnYmNO+Jz05q5q0YUa2LLzSNlORQWnYYNWO9OgcufB6N98sD71Bz/E3jwQM/wwVqeA==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/newspack-scripts/-/newspack-scripts-5.5.0.tgz", + "integrity": "sha512-LyRrx8omcdXR1RuU9OpcsNoWw8GmPNdYxfjFBBbC4s7KDHPRptt5m+3RCzzDjyu2on64yuTK4m1lHlwnSog4Rw==", "dev": true, "requires": { "@automattic/calypso-build": "^10.0.0", diff --git a/package.json b/package.json index 818fb3c6..4834e5ea 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "eslint": "^7.32.0", "ignore-emit-webpack-plugin": "^2.0.6", "lint-staged": "^15.2.5", - "newspack-scripts": "^5.4.0", + "newspack-scripts": "^5.5.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.1", "stylelint": "^16.6.1" From ba76bf16ebd8c817301c2bbe549bdd8fdcf49037 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Wed, 12 Jun 2024 16:18:38 +0100 Subject: [PATCH 08/39] fix: root padding (#178) --- parts/desktop-header.html | 6 +++--- theme.json | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/parts/desktop-header.html b/parts/desktop-header.html index 64a0c2f0..e01bb824 100644 --- a/parts/desktop-header.html +++ b/parts/desktop-header.html @@ -1,5 +1,5 @@ - -
+ +
@@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/theme.json b/theme.json index b57be1bb..c6738ad0 100644 --- a/theme.json +++ b/theme.json @@ -296,6 +296,7 @@ "width": "1px" }, "color": { + "background": "var( --wp--preset--color--base )", "text": "var( --wp--preset--color--accent )" }, "spacing": { @@ -466,6 +467,16 @@ } } }, + "core/cover": { + "spacing": { + "padding": { + "bottom": "var( --wp--preset--spacing--80 )", + "left": "var( --wp--preset--spacing--30 )", + "right": "var( --wp--preset--spacing--30 )", + "top": "var( --wp--preset--spacing--80 )" + } + } + }, "core/gallery": { "spacing": { "margin": { @@ -924,8 +935,8 @@ "blockGap": "var( --wp--preset--spacing--50 )", "padding": { "bottom": "0", - "left": "var( --wp--preset--spacing--20 )", - "right": "var( --wp--preset--spacing--20 )", + "left": "var( --wp--preset--spacing--30 )", + "right": "var( --wp--preset--spacing--30 )", "top": "0" } }, From bda489d1ad43e374034f6722a8d7e7476a8d2de7 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Wed, 12 Jun 2024 17:25:57 +0100 Subject: [PATCH 09/39] feat: remove spacers (#179) --- templates/front-page.html | 8 -------- templates/home.html | 7 +------ templates/index.html | 7 +------ templates/single.html | 6 +----- templates/single/large-image.html | 6 +----- templates/single/wide-image.html | 6 +----- 6 files changed, 5 insertions(+), 35 deletions(-) diff --git a/templates/front-page.html b/templates/front-page.html index 70693cdb..6d4811ab 100644 --- a/templates/front-page.html +++ b/templates/front-page.html @@ -6,12 +6,4 @@ - -
- - - -
- - diff --git a/templates/home.html b/templates/home.html index 7945a849..8d90e59e 100644 --- a/templates/home.html +++ b/templates/home.html @@ -9,10 +9,6 @@ - - - -
@@ -28,6 +24,5 @@ - + - \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 7945a849..8d90e59e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -9,10 +9,6 @@ - - - -
@@ -28,6 +24,5 @@ - + - \ No newline at end of file diff --git a/templates/single.html b/templates/single.html index a16c3526..500d774e 100644 --- a/templates/single.html +++ b/templates/single.html @@ -7,10 +7,6 @@ - - - -
@@ -22,4 +18,4 @@
- \ No newline at end of file + diff --git a/templates/single/large-image.html b/templates/single/large-image.html index 61e16b3f..d8aa17a7 100644 --- a/templates/single/large-image.html +++ b/templates/single/large-image.html @@ -9,10 +9,6 @@
- - - -
@@ -24,4 +20,4 @@
- \ No newline at end of file + diff --git a/templates/single/wide-image.html b/templates/single/wide-image.html index 9777447a..50267788 100644 --- a/templates/single/wide-image.html +++ b/templates/single/wide-image.html @@ -9,10 +9,6 @@
- - - -
@@ -24,4 +20,4 @@
- \ No newline at end of file + From b335e79b881295a4485595d4a667e5e48fc0c6e3 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Thu, 13 Jun 2024 07:56:20 +0100 Subject: [PATCH 10/39] feat: update separator block; improve styles (#180) --- src/scss/block-styles/_block-styles.scss | 1 - src/scss/block-styles/_separator-styles.scss | 5 ---- src/scss/blocks/_blocks.scss | 1 + src/scss/blocks/_separator.scss | 27 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) delete mode 100644 src/scss/block-styles/_separator-styles.scss create mode 100644 src/scss/blocks/_separator.scss diff --git a/src/scss/block-styles/_block-styles.scss b/src/scss/block-styles/_block-styles.scss index e5b8dfc7..1ef36703 100644 --- a/src/scss/block-styles/_block-styles.scss +++ b/src/scss/block-styles/_block-styles.scss @@ -1,4 +1,3 @@ @import url('./_column-styles.scss'); @import url('./_list-styles.scss'); @import url('./_navigation-styles.scss'); -@import url('./_separator-styles.scss'); diff --git a/src/scss/block-styles/_separator-styles.scss b/src/scss/block-styles/_separator-styles.scss deleted file mode 100644 index af0d3295..00000000 --- a/src/scss/block-styles/_separator-styles.scss +++ /dev/null @@ -1,5 +0,0 @@ -.wp-block-separator { - &.is-style-thick { - border-bottom-width: var( --wp--preset--spacing--30 ); - } -} diff --git a/src/scss/blocks/_blocks.scss b/src/scss/blocks/_blocks.scss index 364f57a9..290a8bc5 100644 --- a/src/scss/blocks/_blocks.scss +++ b/src/scss/blocks/_blocks.scss @@ -13,6 +13,7 @@ @import url('./_pullquote.scss'); @import url('./_query-pagination.scss'); @import url('./_quote.scss'); +@import url('./_separator.scss'); @import url('./_sharing-buttons.scss'); @import url('./_search.scss'); @import url('./_table.scss'); diff --git a/src/scss/blocks/_separator.scss b/src/scss/blocks/_separator.scss new file mode 100644 index 00000000..9a83fcec --- /dev/null +++ b/src/scss/blocks/_separator.scss @@ -0,0 +1,27 @@ +.wp-block-separator { + &:not([class*="is-style-"]), + &.is-style-default { + max-width: calc( var( --wp--preset--spacing--50 ) * 4 ) !important; + + &.alignfull { + margin-left: auto; + margin-right: auto; + } + } + + &.is-style-dots { + background: transparent !important; + + &::before { + font-size: var( --wp--preset--font-size--x-large ); + letter-spacing: var( --wp--preset--spacing--80 ); + padding-left: var( --wp--preset--spacing--80 ); + } + } + + &.is-style-thick { + background: currentcolor; + border-bottom-width: 0; + padding: var( --wp--preset--spacing--20 ); + } +} From b20c33ccd843af157adc107eeee455d7a1edfd14 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Thu, 13 Jun 2024 08:23:08 +0100 Subject: [PATCH 11/39] feat: add styles for some specific blocks (audio, verse, jp image compare) --- src/scss/blocks/_audio.scss | 9 +++++++++ src/scss/blocks/_blocks.scss | 2 ++ src/scss/blocks/_image-compare.scss | 6 ++++++ theme.json | 5 +++++ 4 files changed, 22 insertions(+) create mode 100644 src/scss/blocks/_audio.scss create mode 100644 src/scss/blocks/_image-compare.scss diff --git a/src/scss/blocks/_audio.scss b/src/scss/blocks/_audio.scss new file mode 100644 index 00000000..2ce28f8a --- /dev/null +++ b/src/scss/blocks/_audio.scss @@ -0,0 +1,9 @@ +.wp-block-audio { + audio { + display: block; + } + + figcaption { + margin: var(--wp--preset--spacing--20) 0 0; + } +} diff --git a/src/scss/blocks/_blocks.scss b/src/scss/blocks/_blocks.scss index 290a8bc5..320d752f 100644 --- a/src/scss/blocks/_blocks.scss +++ b/src/scss/blocks/_blocks.scss @@ -1,7 +1,9 @@ +@import url('./_audio.scss'); @import url('./_button.scss'); @import url('./_co-authors-plus.scss'); @import url('./_columns.scss'); @import url('./_homepage-articles.scss'); +@import url('./_image-compare.scss'); @import url('./_media-text.scss'); @import url('./_navigation.scss'); @import url('./_paragraph.scss'); diff --git a/src/scss/blocks/_image-compare.scss b/src/scss/blocks/_image-compare.scss new file mode 100644 index 00000000..c5b7cae4 --- /dev/null +++ b/src/scss/blocks/_image-compare.scss @@ -0,0 +1,6 @@ +.wp-block-jetpack-image-compare { + figcaption { + font-size: var( --wp--preset--font-size--x-small ) !important; + text-align: inherit !important; + } +} diff --git a/theme.json b/theme.json index c6738ad0..d756bd6b 100644 --- a/theme.json +++ b/theme.json @@ -783,6 +783,11 @@ "lineHeight": "var( --wp--custom--line-height--large )" } }, + "core/verse": { + "typography": { + "fontFamily": "monospace" + } + }, "jetpack/sharing-buttons": { "spacing": { "blockGap": "var( --wp--preset--spacing--20 )" From 88d46d01243f4a94f3ac6c5e6d38077802c57528 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Thu, 13 Jun 2024 15:20:54 +0100 Subject: [PATCH 12/39] feat: adjust columns block and pagination (#182) --- src/scss/blocks/_blocks.scss | 1 + src/scss/blocks/_columns.scss | 30 +++++++++++++++++++++ src/scss/blocks/_nextpage.scss | 36 ++++++++++++++++++++++++++ src/scss/blocks/_query-pagination.scss | 9 ++++++- 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 src/scss/blocks/_nextpage.scss diff --git a/src/scss/blocks/_blocks.scss b/src/scss/blocks/_blocks.scss index 320d752f..b87a8c4f 100644 --- a/src/scss/blocks/_blocks.scss +++ b/src/scss/blocks/_blocks.scss @@ -6,6 +6,7 @@ @import url('./_image-compare.scss'); @import url('./_media-text.scss'); @import url('./_navigation.scss'); +@import url('./_nextpage.scss'); @import url('./_paragraph.scss'); @import url('./_pagination.scss'); @import url('./_post-author.scss'); diff --git a/src/scss/blocks/_columns.scss b/src/scss/blocks/_columns.scss index 472c45ff..151f8f05 100644 --- a/src/scss/blocks/_columns.scss +++ b/src/scss/blocks/_columns.scss @@ -82,3 +82,33 @@ } } } + +.newspack-grid-small { + @include sass-utils.media(x-large) { + &.wp-block-columns { + display: grid; + grid-template-columns: repeat(6, 1fr); + } + + & > * { + grid-column: 1 / -1; + margin: 0 !important; + } + + .wp-block-column { + grid-column: auto / span 3; + } + + .wp-block-column:only-child { + grid-column-end: span 6; + } + + /* "30 / 70" and "70 / 30" layouts */ + .wp-block-column[style*='33.33%'] { + grid-column-end: span 2; + } + .wp-block-column[style*='66.66%'] { + grid-column-end: span 4; + } + } +} diff --git a/src/scss/blocks/_nextpage.scss b/src/scss/blocks/_nextpage.scss new file mode 100644 index 00000000..9a4465a3 --- /dev/null +++ b/src/scss/blocks/_nextpage.scss @@ -0,0 +1,36 @@ +.post-nav-links { + align-items: center; + border-top: 1px solid var( --wp--preset--color--base-3 ); + color: var( --wp--preset--color--contrast-3 ); + display: flex; + font-size: var( --wp--preset--font-size--small ); + font-weight: 600; + gap: calc( var( --wp--preset--spacing--20 ) / 2 ); + line-height: var( --wp--custom--line-height--small ); + padding-top: var( --wp--preset--spacing--30 ); + + .post-page-numbers { + border-radius: var( --wp--custom--border--radius-medium ); + color: var( --wp--preset--color--contrast ); + display: grid; + height: 2.5rem; + padding: 0; + place-content: center; + text-decoration: none; + transition: background 125ms ease-in-out; + width: 2.5rem; + + &.current { + background: var( --wp--preset--color--accent ); + color: var( --wp--preset--color--base ); + } + + &:first-child { + margin-left: auto; + } + + &:hover:not( .current ) { + background: var( --wp--preset--color--base-2 ); + } + } +} diff --git a/src/scss/blocks/_query-pagination.scss b/src/scss/blocks/_query-pagination.scss index e63769d8..ae44900e 100644 --- a/src/scss/blocks/_query-pagination.scss +++ b/src/scss/blocks/_query-pagination.scss @@ -14,9 +14,11 @@ .wp-block-comments-pagination-numbers, .wp-block-query-pagination-numbers { gap: calc(var(--wp--preset--spacing--20) / 2); + margin: 0; a, .current { + text-decoration: none; height: 2.5rem; padding: 0; width: 2.5rem; @@ -24,6 +26,11 @@ @include sass-utils.all-transition; } } + + .wp-block-query-pagination-next, + .wp-block-query-pagination-previous { + margin: 0; + } } .wp-block-query-pagination { @@ -53,4 +60,4 @@ } } } -} \ No newline at end of file +} From af362abffd9736d01c769568ba2023a5b352b32e Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Thu, 13 Jun 2024 15:28:36 +0100 Subject: [PATCH 13/39] feat: update archive templates (#183) --- templates/archive.html | 90 +++++++++++++++++++++--------------------- templates/author.html | 54 +++++++++++++++---------- templates/search.html | 8 ++-- 3 files changed, 82 insertions(+), 70 deletions(-) diff --git a/templates/archive.html b/templates/archive.html index baf7f02d..22ac1bc1 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -2,48 +2,48 @@
-
- -
- - - - -
-
- - - -
-
- -
- - - - - -
- -
-
-
- - - - -
-
- - - - - - - - -
-
- - - \ No newline at end of file +
+ +
+ + + + +
+
+ + + +
+
+ +
+ + + + + +
+ +
+
+
+ + + + +
+
+ + + + + + + + +
+
+ + + diff --git a/templates/author.html b/templates/author.html index 1e3f9175..fa413d98 100644 --- a/templates/author.html +++ b/templates/author.html @@ -1,42 +1,54 @@ -
-
+
+
-
+
- - -
-
+ +
+
+ +
+
- -
-
-
+ +
+
-
+
- + - + +
-
+
+
+ + + +
+ + + +
+
+ - -
+ +
+
- - -
+ @@ -46,4 +58,4 @@
- \ No newline at end of file + diff --git a/templates/search.html b/templates/search.html index a3f44fbe..3abca918 100644 --- a/templates/search.html +++ b/templates/search.html @@ -33,9 +33,9 @@

Search results for:

- -
-
+ +
+ @@ -54,4 +54,4 @@

Search results for:

- \ No newline at end of file + From 61ea564b8d2ca1cd47ea5b2ccb0be0810099310b Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Thu, 13 Jun 2024 17:15:41 +0100 Subject: [PATCH 14/39] feat: add specific styles for the query block (#184) --- src/scss/_gutenberg-shim.scss | 13 ------- src/scss/blocks/_blocks.scss | 1 + src/scss/blocks/_query-pagination.scss | 16 +++++---- src/scss/blocks/_query.scss | 21 +++++++++++ src/scss/blocks/_search.scss | 7 +--- templates/archive.html | 36 ++++++++++++------- templates/author.html | 10 +++--- templates/search.html | 50 +++++++++++++++----------- 8 files changed, 92 insertions(+), 62 deletions(-) create mode 100644 src/scss/blocks/_query.scss diff --git a/src/scss/_gutenberg-shim.scss b/src/scss/_gutenberg-shim.scss index 2a7d1215..b937636a 100644 --- a/src/scss/_gutenberg-shim.scss +++ b/src/scss/_gutenberg-shim.scss @@ -54,19 +54,6 @@ figcaption a { } } -/* - * Search styles - * Hide date and byline for pages; may want to flip this in the future to all but posts. - */ -.search-results { - .type-page { - .wp-block-post-author, - .wp-block-post-date { - display: none; - } - } -} - /* * Editor styles * diff --git a/src/scss/blocks/_blocks.scss b/src/scss/blocks/_blocks.scss index b87a8c4f..480ae645 100644 --- a/src/scss/blocks/_blocks.scss +++ b/src/scss/blocks/_blocks.scss @@ -14,6 +14,7 @@ @import url('./_post-carousel.scss'); @import url('./_post-terms.scss'); @import url('./_pullquote.scss'); +@import url('./_query.scss'); @import url('./_query-pagination.scss'); @import url('./_quote.scss'); @import url('./_separator.scss'); diff --git a/src/scss/blocks/_query-pagination.scss b/src/scss/blocks/_query-pagination.scss index ae44900e..05b6bd8e 100644 --- a/src/scss/blocks/_query-pagination.scss +++ b/src/scss/blocks/_query-pagination.scss @@ -13,7 +13,7 @@ .wp-block-comments-pagination-numbers, .wp-block-query-pagination-numbers { - gap: calc(var(--wp--preset--spacing--20) / 2); + gap: calc( var( --wp--preset--spacing--20 ) / 2 ); margin: 0; a, @@ -36,9 +36,9 @@ .wp-block-query-pagination { // Justification = Space Between &.is-content-justification-space-between { - @include sass-utils.media(small) { + @include sass-utils.media( small ) { display: grid; - grid-template-columns: repeat(12, 1fr); + grid-template-columns: repeat( 12, 1fr ); } > * { @@ -49,15 +49,19 @@ > .wp-block-query-pagination-numbers:first-child { grid-column-end: span 8; - @include sass-utils.media(small) { + @include sass-utils.media( small ) { &::before { content: ''; display: inline-block; height: 100%; - margin-right: var(--wp--preset--spacing--30); - width: calc(50% - (var(--wp--preset--spacing--30) / 2)); + margin-right: var( --wp--preset--spacing--30 ); + width: calc( 50% - var( --wp--preset--spacing--30 ) / 2 ); } } } } + + &__container:not( :has( & ) ) { + display: none; + } } diff --git a/src/scss/blocks/_query.scss b/src/scss/blocks/_query.scss new file mode 100644 index 00000000..a68ca9b8 --- /dev/null +++ b/src/scss/blocks/_query.scss @@ -0,0 +1,21 @@ +.wp-block-query { + .wp-block-post:not( .type-post ) { + .post-meta, + .wp-block-post-author, + .wp-block-post-date { + display: none; + } + } + + .wp-block-post:not( .has-post-thumbnail ) { + .wp-block-columns:not( .block-editor-block-list__layout ) { + display: block; + + .wp-block-column { + &:empty { + display: none; + } + } + } + } +} diff --git a/src/scss/blocks/_search.scss b/src/scss/blocks/_search.scss index 4c0c68f3..f0f34c89 100644 --- a/src/scss/blocks/_search.scss +++ b/src/scss/blocks/_search.scss @@ -26,13 +26,8 @@ width: 100%; &:focus-within { - outline: 2px solid var( --wp--preset--color--contrast-3 ); + outline: 2px solid var( --wp--preset--color--contrast ); outline-offset: -1px; - - @media ( prefers-contrast: more ) { - border-color: var( --wp--preset--color--contrast ); - outline-color: var( --wp--preset--color--contrast ); - } } .wp-block-search__inside-wrapper { diff --git a/templates/archive.html b/templates/archive.html index 22ac1bc1..d4d3593c 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -7,32 +7,44 @@
- - -
-
+ +
+
+ +
+
- -
+ +
- + - -
+ +
- +
+ + + +
+ + + +
+
+ - -
+ +
diff --git a/templates/author.html b/templates/author.html index fa413d98..26ed8942 100644 --- a/templates/author.html +++ b/templates/author.html @@ -22,10 +22,10 @@
- + - -
+ +
@@ -43,8 +43,8 @@
- -
+ +
diff --git a/templates/search.html b/templates/search.html index 3abca918..1a262f42 100644 --- a/templates/search.html +++ b/templates/search.html @@ -5,42 +5,52 @@

Search results for:

-
+
- -
- -
-
-
-
-
+ +
+
+
+ +
+
+ + + +
+
-
+
- + - + +
-
+
+
+ +
-
+
+ + + +
- -
+ +
+
- - - -
+ From 217be197344bdffa5b94eb5e5e2a29e60733d1da Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Fri, 14 Jun 2024 14:05:57 +0100 Subject: [PATCH 15/39] feat: move all block styles to JS (#185) --- includes/class-core.php | 24 ------------------- src/js/editor/block-styles/column.js | 7 ++++++ src/js/editor/block-styles/group.js | 4 ++++ src/js/editor/block-styles/list.js | 7 ++++++ .../{navigation-styles.js => navigation.js} | 0 .../{separator-styles.js => separator.js} | 2 +- src/js/editor/index.js | 7 ++++-- 7 files changed, 24 insertions(+), 27 deletions(-) create mode 100644 src/js/editor/block-styles/column.js create mode 100644 src/js/editor/block-styles/group.js create mode 100644 src/js/editor/block-styles/list.js rename src/js/editor/block-styles/{navigation-styles.js => navigation.js} (100%) rename src/js/editor/block-styles/{separator-styles.js => separator.js} (67%) diff --git a/includes/class-core.php b/includes/class-core.php index 4b9ff8fd..b6c96721 100644 --- a/includes/class-core.php +++ b/includes/class-core.php @@ -43,7 +43,6 @@ public function __construct() { \add_action( 'enqueue_block_editor_assets', [ __CLASS__, 'editor_scripts' ] ); \add_filter( 'block_type_metadata', [ __CLASS__, 'block_variations' ] ); \add_action( 'init', [ __CLASS__, 'block_pattern_categories' ] ); - \add_action( 'init', [ __CLASS__, 'register_block_styles' ] ); } /** @@ -149,29 +148,6 @@ public static function block_pattern_categories() { ) ); } - - /** - * Register new block styles. - * - * @since Newspack Block Theme 1.0 - */ - public static function register_block_styles() { - register_block_style( - 'core/column', - array( - 'name' => 'rounded', - 'label' => __( 'Rounded', 'newspack-block-theme' ), - ) - ); - - register_block_style( - 'core/list', - array( - 'name' => 'checked', - 'label' => __( 'Checked', 'newspack-block-theme' ), - ) - ); - } } Core::instance(); diff --git a/src/js/editor/block-styles/column.js b/src/js/editor/block-styles/column.js new file mode 100644 index 00000000..b70438de --- /dev/null +++ b/src/js/editor/block-styles/column.js @@ -0,0 +1,7 @@ +// Add style to apply a border-radius (6px) to the Column block. +wp.domReady( () => { + wp.blocks.registerBlockStyle( 'core/column', { + name: 'rounded', + label: 'Rounded', + } ); +} ); diff --git a/src/js/editor/block-styles/group.js b/src/js/editor/block-styles/group.js new file mode 100644 index 00000000..204a9fa8 --- /dev/null +++ b/src/js/editor/block-styles/group.js @@ -0,0 +1,4 @@ +// Remove the Border style that is coming from Newspack Blocks. +wp.domReady( () => { + wp.blocks.unregisterBlockStyle( 'core/group', 'border' ); +} ); diff --git a/src/js/editor/block-styles/list.js b/src/js/editor/block-styles/list.js new file mode 100644 index 00000000..2535e31c --- /dev/null +++ b/src/js/editor/block-styles/list.js @@ -0,0 +1,7 @@ +// Add style to insert a check icon before each item in the List block. +wp.domReady( () => { + wp.blocks.registerBlockStyle( 'core/list', { + name: 'checked', + label: 'Checked', + } ); +} ); diff --git a/src/js/editor/block-styles/navigation-styles.js b/src/js/editor/block-styles/navigation.js similarity index 100% rename from src/js/editor/block-styles/navigation-styles.js rename to src/js/editor/block-styles/navigation.js diff --git a/src/js/editor/block-styles/separator-styles.js b/src/js/editor/block-styles/separator.js similarity index 67% rename from src/js/editor/block-styles/separator-styles.js rename to src/js/editor/block-styles/separator.js index 6f0684cc..a98a6cc6 100644 --- a/src/js/editor/block-styles/separator-styles.js +++ b/src/js/editor/block-styles/separator.js @@ -1,4 +1,4 @@ -// Add style to make the Separator block 'tick' (16px). +// Add style to make the Separator block 'thick' (16px). wp.domReady( () => { wp.blocks.registerBlockStyle( 'core/separator', { name: 'thick', diff --git a/src/js/editor/index.js b/src/js/editor/index.js index 16293ec4..cc3b8252 100644 --- a/src/js/editor/index.js +++ b/src/js/editor/index.js @@ -1,3 +1,6 @@ import '../shared/_shared-module'; -import './block-styles/navigation-styles.js'; -import './block-styles/separator-styles.js'; +import './block-styles/column.js'; +import './block-styles/group.js'; +import './block-styles/list.js'; +import './block-styles/navigation.js'; +import './block-styles/separator.js'; From 73085a2ef57e29ce3b0df71547ef5e714abbdd12 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Fri, 14 Jun 2024 14:15:01 +0100 Subject: [PATCH 16/39] chore: move block-styles files to blocks (#186) --- src/scss/block-styles/_block-styles.scss | 3 - src/scss/block-styles/_navigation-styles.scss | 80 ----------------- src/scss/blocks/_blocks.scss | 2 + .../_column.scss} | 0 .../_list-styles.scss => blocks/_list.scss} | 0 src/scss/blocks/_navigation.scss | 86 ++++++++++++++++++- src/scss/style.scss | 1 - 7 files changed, 85 insertions(+), 87 deletions(-) delete mode 100644 src/scss/block-styles/_block-styles.scss delete mode 100644 src/scss/block-styles/_navigation-styles.scss rename src/scss/{block-styles/_column-styles.scss => blocks/_column.scss} (100%) rename src/scss/{block-styles/_list-styles.scss => blocks/_list.scss} (100%) diff --git a/src/scss/block-styles/_block-styles.scss b/src/scss/block-styles/_block-styles.scss deleted file mode 100644 index 1ef36703..00000000 --- a/src/scss/block-styles/_block-styles.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import url('./_column-styles.scss'); -@import url('./_list-styles.scss'); -@import url('./_navigation-styles.scss'); diff --git a/src/scss/block-styles/_navigation-styles.scss b/src/scss/block-styles/_navigation-styles.scss deleted file mode 100644 index dc735da2..00000000 --- a/src/scss/block-styles/_navigation-styles.scss +++ /dev/null @@ -1,80 +0,0 @@ -.wp-block-navigation { - &.is-style-flatten { - // TODO: restrict this just to the vertical block variation. - // In the meantime, we'll use CSS so the styles are only applied there. - // See: https://github.com/WordPress/gutenberg/issues/40621. - &.is-vertical { - .wp-block-navigation-item { - flex-wrap: wrap; - } - - .wp-block-navigation__submenu-icon { - display: none; - } - - .wp-block-navigation__submenu-container { - overflow: visible; - } - - &:not(.has-background) .wp-block-navigation__submenu-container { - background: transparent; - } - - &:not(.has-text-color) .wp-block-navigation__submenu-container { - color: inherit; - } - - .has-child { - gap: var(--wp--preset--spacing--30); - - .wp-block-navigation__submenu-container { - border: 0; - border-radius: 0; - box-shadow: none; - gap: inherit; - height: unset; - padding: 0 0 0 var(--wp--preset--spacing--30); - position: static; - opacity: unset; - visibility: unset; - } - - .wp-block-navigation__submenu-container, - .wp-block-navigation-submenu__toggle[aria-expanded='true'] - ~ .wp-block-navigation__submenu-container, - &:not(.open-on-click):hover > .wp-block-navigation__submenu-container { - width: 100%; - } - - &.has-child-selected > .wp-block-navigation__submenu-container, - &.is-selected > .wp-block-navigation__submenu-container { - width: 100% !important; - } - } - - &.has-background .has-child { - gap: var(--wp--preset--spacing--20); - } - } - } - - &.primary-navigation { - row-gap: var(--wp--preset--spacing--20); - .wp-block-page-list > li { - min-height: 36px; - } - } - - a { - text-decoration-color: transparent; - text-decoration-thickness: 0.125em !important; - text-underline-offset: 0.375em; - transition: text-decoration-color 125ms ease-in-out; - transition-delay: 100ms; - - &:not(.wp-element-button):hover { - text-decoration: underline; - text-decoration-color: currentcolor; - } - } -} diff --git a/src/scss/blocks/_blocks.scss b/src/scss/blocks/_blocks.scss index 480ae645..f14e80ab 100644 --- a/src/scss/blocks/_blocks.scss +++ b/src/scss/blocks/_blocks.scss @@ -1,9 +1,11 @@ @import url('./_audio.scss'); @import url('./_button.scss'); @import url('./_co-authors-plus.scss'); +@import url('./_column.scss'); @import url('./_columns.scss'); @import url('./_homepage-articles.scss'); @import url('./_image-compare.scss'); +@import url('./_list.scss'); @import url('./_media-text.scss'); @import url('./_navigation.scss'); @import url('./_nextpage.scss'); diff --git a/src/scss/block-styles/_column-styles.scss b/src/scss/blocks/_column.scss similarity index 100% rename from src/scss/block-styles/_column-styles.scss rename to src/scss/blocks/_column.scss diff --git a/src/scss/block-styles/_list-styles.scss b/src/scss/blocks/_list.scss similarity index 100% rename from src/scss/block-styles/_list-styles.scss rename to src/scss/blocks/_list.scss diff --git a/src/scss/blocks/_navigation.scss b/src/scss/blocks/_navigation.scss index 6fdf150e..4ccfb693 100644 --- a/src/scss/blocks/_navigation.scss +++ b/src/scss/blocks/_navigation.scss @@ -41,8 +41,88 @@ } } - a:not( .wp-element-button ):focus-visible { - outline: 2px solid; - outline-offset: 1px; + &.is-style-flatten { + // TODO: restrict this just to the vertical block variation. + // In the meantime, we'll use CSS so the styles are only applied there. + // See: https://github.com/WordPress/gutenberg/issues/40621. + &.is-vertical { + .wp-block-navigation-item { + flex-wrap: wrap; + } + + .wp-block-navigation__submenu-icon { + display: none; + } + + .wp-block-navigation__submenu-container { + overflow: visible; + } + + &:not( .has-background ) .wp-block-navigation__submenu-container { + background: transparent; + } + + &:not( .has-text-color ) .wp-block-navigation__submenu-container { + color: inherit; + } + + .has-child { + gap: var( --wp--preset--spacing--30 ); + + .wp-block-navigation__submenu-container { + border: 0; + border-radius: 0; + box-shadow: none; + gap: inherit; + height: unset; + padding: 0 0 0 var( --wp--preset--spacing--30 ); + position: static; + opacity: unset; + visibility: unset; + } + + .wp-block-navigation__submenu-container, + .wp-block-navigation-submenu__toggle[aria-expanded='true'] + ~ .wp-block-navigation__submenu-container, + &:not( .open-on-click ):hover > .wp-block-navigation__submenu-container { + width: 100%; + } + + &.has-child-selected > .wp-block-navigation__submenu-container, + &.is-selected > .wp-block-navigation__submenu-container { + width: 100% !important; + } + } + + &.has-background .has-child { + gap: var( --wp--preset--spacing--20 ); + } + } + } + + &.primary-navigation { + row-gap: var( --wp--preset--spacing--20 ); + .wp-block-page-list > li { + min-height: 36px; + } + } + + a { + text-decoration-color: transparent; + text-decoration-thickness: 0.125em !important; + text-underline-offset: 0.375em; + transition: text-decoration-color 125ms ease-in-out; + transition-delay: 100ms; + + &:not( .wp-element-button ):hover { + text-decoration: underline; + text-decoration-color: currentcolor; + } + + &:not( .wp-element-button ):focus-visible { + outline: 2px solid; + outline-offset: 1px; + } + } } diff --git a/src/scss/style.scss b/src/scss/style.scss index f711bb6d..b06d2ec5 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -5,7 +5,6 @@ @import url('./_gutenberg-shim.scss'); @import url('./blocks/_blocks.scss'); @import url('./block-patterns/_block-patterns.scss'); -@import url('./block-styles/_block-styles.scss'); @import url('./_header.scss'); @import url('./_comments-overlay.scss'); @import url('./_search-overlay.scss'); From 0d91907cf9c58d4382b29faae8169d993ee01316 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Fri, 14 Jun 2024 17:21:53 +0100 Subject: [PATCH 17/39] feat: update columns with borders style (#187) --- src/scss/blocks/_columns.scss | 44 ++++++++++++++++++++++++----------- theme.json | 5 +++- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/scss/blocks/_columns.scss b/src/scss/blocks/_columns.scss index 151f8f05..ac397b69 100644 --- a/src/scss/blocks/_columns.scss +++ b/src/scss/blocks/_columns.scss @@ -7,35 +7,51 @@ .wp-block-column:empty { display: none; - @include sass-utils.media(medium) { + @include sass-utils.media( medium ) { display: inherit; } } - &.is-style-borders > .wp-block-column::after { - border-color: var(--wp--preset--color--base-3); + &.is-style-borders { + gap: var( --wp--preset--spacing--80 ) !important; - .has-background &, - .has-text-color & { - border-color: currentcolor; // Fallback - border-color: color-mix(in srgb, currentcolor 15%, transparent); + > .wp-block-column::after { + border-color: var( --wp--preset--color--base-3 ); + bottom: calc( -1 * var( --wp--preset--spacing--80 ) / 2 - 0.5px ); + + @include sass-utils.media( medium ) { + bottom: 0; + right: calc( -1 * var( --wp--preset--spacing--80 ) / 2 - 0.5px ); + } + + .has-background &, + .has-text-color & { + border-color: currentcolor; // Fallback + border-color: color-mix( in srgb, currentcolor 15%, transparent ); + } + } + + &.is-not-stacked-on-mobile { + > .wp-block-column::after { + right: calc( -1 * var( --wp--preset--spacing--80 ) / 2 - 0.5px ); + } } } } // Newspack Grid .newspack-grid { - @include sass-utils.media(large) { + @include sass-utils.media( large ) { /* "25 / 50 / 25" layout */ .wp-block-column[style*='25%'] { max-width: 300px; } } - @include sass-utils.media(x-large) { + @include sass-utils.media( x-large ) { &.wp-block-columns { display: grid; - grid-template-columns: repeat(12, 1fr); + grid-template-columns: repeat( 12, 1fr ); } & > * { @@ -52,8 +68,8 @@ } /* "33 / 33 / 33" layout */ - .wp-block-column:not([style*='flex-basis']):nth-last-child(3):first-child, - .wp-block-column:not([style*='flex-basis']):nth-last-child(3):first-child ~ .wp-block-column { + .wp-block-column:not( [style*='flex-basis'] ):nth-last-child( 3 ):first-child, + .wp-block-column:not( [style*='flex-basis'] ):nth-last-child( 3 ):first-child ~ .wp-block-column { grid-column-end: span 4; } @@ -84,10 +100,10 @@ } .newspack-grid-small { - @include sass-utils.media(x-large) { + @include sass-utils.media( x-large ) { &.wp-block-columns { display: grid; - grid-template-columns: repeat(6, 1fr); + grid-template-columns: repeat( 6, 1fr ); } & > * { diff --git a/theme.json b/theme.json index d756bd6b..5a9aa322 100644 --- a/theme.json +++ b/theme.json @@ -336,7 +336,10 @@ }, "core/columns": { "spacing": { - "blockGap": "var( --wp--preset--spacing--50 )", + "blockGap": { + "left": "var( --wp--preset--spacing--50 )", + "top": "var( --wp--preset--spacing--50 )" + }, "margin": { "bottom": "var( --wp--preset--spacing--50 )" } From 6680158ed10a86586dc518590e24cc4462d2b189 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 02:14:15 +0000 Subject: [PATCH 18/39] chore(deps-dev): bump prettier from 3.3.1 to 3.3.2 Bumps [prettier](https://github.com/prettier/prettier) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.3.1...3.3.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 791fb2cd..f1bbe61d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "lint-staged": "^15.2.5", "newspack-scripts": "^5.5.0", "postcss-scss": "^4.0.9", - "prettier": "^3.3.1", + "prettier": "^3.3.2", "stylelint": "^16.6.1" } }, @@ -27614,9 +27614,9 @@ } }, "node_modules/prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", - "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -54804,9 +54804,9 @@ "dev": true }, "prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", - "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 89ef4b9d..171d781f 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "lint-staged": "^15.2.5", "newspack-scripts": "^5.5.0", "postcss-scss": "^4.0.9", - "prettier": "^3.3.1", + "prettier": "^3.3.2", "stylelint": "^16.6.1" } } From 62aee779bc1bf93cc9b8f7c429d189f591bd90c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 02:13:55 +0000 Subject: [PATCH 19/39] chore(deps-dev): bump lint-staged from 15.2.5 to 15.2.7 Bumps [lint-staged](https://github.com/okonet/lint-staged) from 15.2.5 to 15.2.7. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/okonet/lint-staged/compare/v15.2.5...v15.2.7) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1bbe61d..74c6d9aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@rushstack/eslint-patch": "^1.10.3", "eslint": "^7.32.0", "ignore-emit-webpack-plugin": "^2.0.6", - "lint-staged": "^15.2.5", + "lint-staged": "^15.2.7", "newspack-scripts": "^5.5.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.2", @@ -18830,9 +18830,9 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", - "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", + "version": "15.2.7", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.7.tgz", + "integrity": "sha512-+FdVbbCZ+yoh7E/RosSdqKJyUM2OEjTciH0TFNkawKgvFp1zbGlEC39RADg+xKBG1R4mhoH2j85myBQZ5wR+lw==", "dev": true, "dependencies": { "chalk": "~5.3.0", @@ -48237,9 +48237,9 @@ "dev": true }, "lint-staged": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", - "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", + "version": "15.2.7", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.7.tgz", + "integrity": "sha512-+FdVbbCZ+yoh7E/RosSdqKJyUM2OEjTciH0TFNkawKgvFp1zbGlEC39RADg+xKBG1R4mhoH2j85myBQZ5wR+lw==", "dev": true, "requires": { "chalk": "~5.3.0", diff --git a/package.json b/package.json index 171d781f..1dfbf4cd 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@rushstack/eslint-patch": "^1.10.3", "eslint": "^7.32.0", "ignore-emit-webpack-plugin": "^2.0.6", - "lint-staged": "^15.2.5", + "lint-staged": "^15.2.7", "newspack-scripts": "^5.5.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.2", From b5c00f7c8f04d034f350170cbfe892790eb25eee Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Tue, 18 Jun 2024 14:51:21 +0100 Subject: [PATCH 20/39] feat(columns): force flex-basis when using newspack-grid and a 25/50/25 layout (#191) --- src/scss/blocks/_columns.scss | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/scss/blocks/_columns.scss b/src/scss/blocks/_columns.scss index ac397b69..01d64ed2 100644 --- a/src/scss/blocks/_columns.scss +++ b/src/scss/blocks/_columns.scss @@ -97,6 +97,30 @@ grid-column-end: span 8; } } + + /* "25 / 50 / 25" layout */ + &:has( .wp-block-column[style*='25%']:empty ):has( .wp-block-column[style*='50%'] ) { + justify-content: center; + + .wp-block-column[style*='50%'] { + flex-basis: 100% !important; + max-width: var( --wp--style--global--content-size ); + } + + .wp-block-column[style*='25%']:empty { + display: none; + + @include sass-utils.media( x-large ) { + display: inherit; + } + } + + &:has( :not( .wp-block-column[style*='25%']:empty ) ) { + .wp-block-column[style*='50%'] { + flex-basis: 75% !important; + } + } + } } .newspack-grid-small { From 29fb0ca1b71e2ff3b217bd8a5718b549c6916adf Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Wed, 19 Jun 2024 08:30:50 +0100 Subject: [PATCH 21/39] feat: update single template (#192) --- parts/author-bio.html | 20 ++--- parts/post-footer.html | 12 ++- src/js/editor/block-styles/post-terms.js | 12 +++ src/js/editor/index.js | 1 + src/scss/_base.scss | 15 ++++ src/scss/_mixins.scss | 6 +- src/scss/blocks/_nextpage.scss | 2 +- src/scss/blocks/_post-terms.scss | 101 +++++++++++++++++++++-- src/scss/blocks/_query-pagination.scss | 2 +- src/scss/blocks/_search.scss | 10 +-- src/scss/blocks/_sharing-buttons.scss | 10 +-- templates/single.html | 18 ++-- theme.json | 30 ++++--- 13 files changed, 178 insertions(+), 61 deletions(-) create mode 100644 src/js/editor/block-styles/post-terms.js diff --git a/parts/author-bio.html b/parts/author-bio.html index d9c0166a..05c4ee6d 100644 --- a/parts/author-bio.html +++ b/parts/author-bio.html @@ -1,17 +1,15 @@ - -
-
+ +
+
- -
+ +
- -
-
+
- -
+ +
- \ No newline at end of file + diff --git a/parts/post-footer.html b/parts/post-footer.html index 0f97868f..fdb92409 100644 --- a/parts/post-footer.html +++ b/parts/post-footer.html @@ -1,5 +1,9 @@ - -
-
+ +
+ + +
+ +
- \ No newline at end of file + diff --git a/src/js/editor/block-styles/post-terms.js b/src/js/editor/block-styles/post-terms.js new file mode 100644 index 00000000..58e68810 --- /dev/null +++ b/src/js/editor/block-styles/post-terms.js @@ -0,0 +1,12 @@ +// Add styles to display the post terms as buttons or links. +wp.domReady( () => { + wp.blocks.registerBlockStyle( 'core/post-terms', { + name: 'buttons', + label: 'Buttons', + } ); + + wp.blocks.registerBlockStyle( 'core/post-terms', { + name: 'links', + label: 'Links', + } ); +} ); diff --git a/src/js/editor/index.js b/src/js/editor/index.js index cc3b8252..570a2224 100644 --- a/src/js/editor/index.js +++ b/src/js/editor/index.js @@ -3,4 +3,5 @@ import './block-styles/column.js'; import './block-styles/group.js'; import './block-styles/list.js'; import './block-styles/navigation.js'; +import './block-styles/post-terms.js'; import './block-styles/separator.js'; diff --git a/src/scss/_base.scss b/src/scss/_base.scss index 4eefe5e0..ab4fb179 100644 --- a/src/scss/_base.scss +++ b/src/scss/_base.scss @@ -81,6 +81,21 @@ ul, ol { mask: url('../../src/images/icon-search.svg') 0 0 no-repeat; } +// Content +.post-image { + &:empty { + &::before { + background: var( --wp--preset--color--base-3 ); + content: ""; + display: block; + height: 1px; + width: 100%; + margin: 0 auto; + max-width: var( --wp--style--global--wide-size ); + } + } +} + // Footer footer { &.wp-block-template-part { diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss index 2b5f1806..1718c895 100644 --- a/src/scss/_mixins.scss +++ b/src/scss/_mixins.scss @@ -6,7 +6,7 @@ font-family: var( --wp--preset--font-family--system-font ); font-size: var( --wp--preset--font-size--small ); line-height: var( --wp--custom--line-height--small ); - padding: calc( 0.75rem - 1px ); + padding: calc( var( --wp--custom--spacing--25 ) - 1px ); transition: background-color 125ms ease-in-out, border-color 125ms ease-in-out, outline 125ms ease-in-out; @media ( prefers-contrast: more ) { @@ -78,7 +78,7 @@ @mixin checkbox { border-radius: var( --wp--custom--border--radius-xx-small ); - + &::before { background: transparent url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath d='M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z' fill='white'%3E%3C/path%3E%3C/svg%3E" ) @@ -189,4 +189,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/scss/blocks/_nextpage.scss b/src/scss/blocks/_nextpage.scss index 9a4465a3..1a04e392 100644 --- a/src/scss/blocks/_nextpage.scss +++ b/src/scss/blocks/_nextpage.scss @@ -5,7 +5,7 @@ display: flex; font-size: var( --wp--preset--font-size--small ); font-weight: 600; - gap: calc( var( --wp--preset--spacing--20 ) / 2 ); + gap: var( --wp--custom--spacing--10 ); line-height: var( --wp--custom--line-height--small ); padding-top: var( --wp--preset--spacing--30 ); diff --git a/src/scss/blocks/_post-terms.scss b/src/scss/blocks/_post-terms.scss index d91a2abd..285282b1 100644 --- a/src/scss/blocks/_post-terms.scss +++ b/src/scss/blocks/_post-terms.scss @@ -1,15 +1,102 @@ +@use '../sass-utils'; + .wp-block-post-terms { - &.taxonomy-post_tag { - a { - border: 1px solid var(--wp--custom--color--gray-100); - border-radius: var(--wp--custom--border--radius-medium); - display: inline-block; - margin-right: 0.25rem; - padding: 0.1875rem 0.5625rem; + &.is-style-buttons { + align-items: center; + display: flex; + flex-wrap: wrap; + font-size: var( --wp--preset--font-size--x-small ); + font-weight: 400; + gap: var( --wp--custom--spacing--10 ); + text-transform: none; + + a, + > span:not( [class*="wp-block-post-terms__"] ) { + background: var( --wp--preset--color--base-2 ); + border-radius: var( --wp--custom--border--radius-small ); + color: var( --wp--preset--color--contrast ); + display: grid; + font-weight: 600; + min-height: var( --wp--preset--spacing--50 ); + padding: var( --wp--custom--spacing--10 ) var( --wp--preset--spacing--20 ); + place-items: center; + + @include sass-utils.all-transition; + + &:hover { + background: var( --wp--preset--color--base-3 ); + text-decoration: none; + } + + &:focus { + outline: none; + } + + &:focus-visible { + outline: 2px solid; + outline-offset: 1px; + } + } + + .wp-block-post-terms__prefix { + padding-right: var( --wp--custom--spacing--10 ); + } + + .wp-block-post-terms__suffix { + padding-left: var( --wp--custom--spacing--10 ); } .wp-block-post-terms__separator { display: none; } + + &:not( [class*="-font-size"] ) { + line-height: var( --wp--custom--line-height--x-small ); + } + + &[class*="-font-size"] { + a, + > span:not( [class*="wp-block-post-terms__"] ) { + padding: var( --wp--custom--spacing--25 ) var( --wp--preset--spacing--40 ); + } + } + + &.has-background { + a, + > span:not( [class*="wp-block-post-terms__"] ) { + background: color-mix( in srgb, currentcolor 15%, transparent ); + color: currentcolor; + + &:hover { + background: color-mix( in srgb, currentcolor 20%, transparent ); + } + } + } + } + + &.is-style-links { + color: var( --wp--preset--color--contrast-3 ); + font-size: var(--wp--preset--font-size--x-small); + font-weight: 400; + line-height: var(--wp--custom--line-height--x-small); + text-transform: none; + + a { + text-decoration: underline; + + &:hover { + text-decoration: none; + } + } + + > span:not( [class*="wp-block-post-terms__"] ) { + text-decoration: underline; + } + + &:not( .has-link-color ) { + a { + color: inherit; + } + } } } diff --git a/src/scss/blocks/_query-pagination.scss b/src/scss/blocks/_query-pagination.scss index 05b6bd8e..8cd7c840 100644 --- a/src/scss/blocks/_query-pagination.scss +++ b/src/scss/blocks/_query-pagination.scss @@ -13,7 +13,7 @@ .wp-block-comments-pagination-numbers, .wp-block-query-pagination-numbers { - gap: calc( var( --wp--preset--spacing--20 ) / 2 ); + gap: var( --wp--custom--spacing--10 ); margin: 0; a, diff --git a/src/scss/blocks/_search.scss b/src/scss/blocks/_search.scss index f0f34c89..fad31824 100644 --- a/src/scss/blocks/_search.scss +++ b/src/scss/blocks/_search.scss @@ -4,7 +4,7 @@ .wp-block-search__button.has-icon { height: 3rem; line-height: 1; - padding: 0.75rem; + padding: var( --wp--custom--spacing--25 ); svg { height: 36px; @@ -60,12 +60,12 @@ padding: calc( 0.625rem - 1px ); &:has(> .has-small-font-size) { - gap: calc( 0.375rem - 1px ); - padding: calc( 0.375rem - 1px ); + gap: calc( var( --wp--custom--spacing--15 ) - 1px ); + padding: calc( var( --wp--custom--spacing--15 ) - 1px ); .wp-block-search__input { - padding-left: 0.375rem; - padding-right: 0.375rem; + padding-left: var( --wp--custom--spacing--15 ); + padding-right: var( --wp--custom--spacing--15 ); } } } diff --git a/src/scss/blocks/_sharing-buttons.scss b/src/scss/blocks/_sharing-buttons.scss index f81bd333..5d03098f 100644 --- a/src/scss/blocks/_sharing-buttons.scss +++ b/src/scss/blocks/_sharing-buttons.scss @@ -1,7 +1,7 @@ @use '../sass-utils'; .wp-block-jetpack-sharing-buttons { - gap: calc( var( --wp--preset--spacing--20 ) / 2 ); + gap: var( --wp--custom--spacing--10 ); .jetpack-sharing-button { &__button { @@ -34,11 +34,11 @@ font-family: var( --newspack-ui-font-family, system-ui, sans-serif ); font-size: var( --wp--preset--font-size--x-small ); font-weight: 600; - gap: calc( var( --wp--preset--spacing--20 ) / 2 ); + gap: var( --wp--custom--spacing--10 ); line-height: var( --wp--custom--line-height--x-small ); min-height: var( --wp--preset--spacing--50 ); min-width: var( --wp--preset--spacing--50 ); - padding: calc( var( --wp--preset--spacing--20 ) / 2 - 1px ) calc( var( --wp--preset--spacing--20 ) - 1px ); + padding: calc( var( --wp--custom--spacing--10 ) - 1px ) calc( var( --wp--preset--spacing--20 ) - 1px ); &:hover { background: var( --newspack-ui-color-neutral-5, var( --wp--preset--color--base-2 ) ); @@ -68,7 +68,7 @@ } .style-icon { - padding: calc( var( --wp--preset--spacing--20 ) * 0.75 ); + padding: var( --wp--custom--spacing--15 ); &:hover { svg { @@ -112,4 +112,4 @@ padding-right: var( --wp--preset--spacing--40 ); } } -} \ No newline at end of file +} diff --git a/templates/single.html b/templates/single.html index 500d774e..e17f0065 100644 --- a/templates/single.html +++ b/templates/single.html @@ -2,20 +2,14 @@ - -
- - - - -
- -
-
+ +
- -
+ +
+ + diff --git a/theme.json b/theme.json index 5a9aa322..91b58ff5 100644 --- a/theme.json +++ b/theme.json @@ -234,6 +234,12 @@ "xxxxx-large": "1.1", "xxxxxx-large": "1.08333333333" }, + "spacing": { + "00": "0", + "10": "0.25rem", + "15": "0.375rem", + "25": "0.75rem" + }, "width": { "x-small": "300px", "small": "410px", @@ -278,10 +284,10 @@ "core/button": { "spacing": { "padding": { - "bottom": "0.75rem", - "left": "1.5rem", - "right": "1.5rem", - "top": "0.75rem" + "bottom": "var( --wp--custom--spacing--25 )", + "left": "var( --wp--preset--spacing--40 )", + "right": "var( --wp--preset--spacing--40 )", + "top": "var( --wp--custom--spacing--25 )" } }, "typography": { @@ -301,10 +307,10 @@ }, "spacing": { "padding": { - "bottom": "calc( 0.75rem - 1px )", - "left": "calc( 1.5rem - 1px )", - "right": "calc( 1.5rem - 1px )", - "top": "calc( 0.75rem - 1px )" + "bottom": "calc( var( --wp--custom--spacing--25 ) - 1px )", + "left": "calc( var( --wp--preset--spacing--40 ) - 1px )", + "right": "calc( var( --wp--preset--spacing--40 ) - 1px )", + "top": "calc( var( --wp--custom--spacing--25 ) - 1px )" } } } @@ -854,10 +860,10 @@ }, "spacing": { "padding": { - "bottom": "0.75rem", - "left": "1.5rem", - "right": "1.5rem", - "top": "0.75rem" + "bottom": "var( --wp--custom--spacing--25 )", + "left": "var( --wp--preset--spacing--40 )", + "right": "var( --wp--preset--spacing--40 )", + "top": "var( --wp--custom--spacing--25 )" } }, "typography": { From 8bf31f5f0c8f6511e5e4bd9d88df4b28b3c47ce6 Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Wed, 19 Jun 2024 14:10:10 +0100 Subject: [PATCH 22/39] feat: add post-content block styles (#193) --- src/scss/blocks/_blocks.scss | 3 ++- src/scss/blocks/_post-content.scss | 8 ++++++++ templates/404.html | 22 +++++++++++++--------- templates/front-page.html | 10 ++++------ templates/page.html | 10 ++++------ templates/page/blank-footer.html | 6 ++---- templates/page/blank.html | 6 ++---- templates/single.html | 4 ++-- theme.json | 8 ++++++++ 9 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 src/scss/blocks/_post-content.scss diff --git a/src/scss/blocks/_blocks.scss b/src/scss/blocks/_blocks.scss index f14e80ab..47056226 100644 --- a/src/scss/blocks/_blocks.scss +++ b/src/scss/blocks/_blocks.scss @@ -12,8 +12,9 @@ @import url('./_paragraph.scss'); @import url('./_pagination.scss'); @import url('./_post-author.scss'); -@import url('./_post-comments.scss'); @import url('./_post-carousel.scss'); +@import url('./_post-comments.scss'); +@import url('./_post-content.scss'); @import url('./_post-terms.scss'); @import url('./_pullquote.scss'); @import url('./_query.scss'); diff --git a/src/scss/blocks/_post-content.scss b/src/scss/blocks/_post-content.scss new file mode 100644 index 00000000..a4de4e61 --- /dev/null +++ b/src/scss/blocks/_post-content.scss @@ -0,0 +1,8 @@ +.wp-block-post-content { + > .alignfull { + margin-left: calc( -1 * var( --wp--preset--spacing--30 ) ); + margin-right: calc( -1 * var( --wp--preset--spacing--30 ) ); + padding-left: var( --wp--preset--spacing--30 ); + padding-right: var( --wp--preset--spacing--30 ); + } +} diff --git a/templates/404.html b/templates/404.html index 995d5d71..ccf0e5bc 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,23 +1,27 @@ - -
+ +
+

Page not found

+ - + +

It looks like nothing was found at this location. Maybe try a search?

+ - + - +

No thanks, take me to the homepage.

- -
-

Latest articles

+ +
+

Latest articles

- \ No newline at end of file + diff --git a/templates/front-page.html b/templates/front-page.html index 6d4811ab..a5bb9f68 100644 --- a/templates/front-page.html +++ b/templates/front-page.html @@ -1,9 +1,7 @@ - + - -
- -
+ +
- + diff --git a/templates/page.html b/templates/page.html index b767f8ad..2dee9d4f 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,13 +1,11 @@ - +
- -
- -
+ +
- \ No newline at end of file + diff --git a/templates/page/blank-footer.html b/templates/page/blank-footer.html index 5a567c37..f5227b4b 100644 --- a/templates/page/blank-footer.html +++ b/templates/page/blank-footer.html @@ -1,7 +1,5 @@ - -
- -
+ +
diff --git a/templates/page/blank.html b/templates/page/blank.html index f9cffb8b..1262bdef 100644 --- a/templates/page/blank.html +++ b/templates/page/blank.html @@ -1,5 +1,3 @@ - -
- -
+ +
diff --git a/templates/single.html b/templates/single.html index e17f0065..774b7c6e 100644 --- a/templates/single.html +++ b/templates/single.html @@ -6,8 +6,8 @@
- -
+ +
diff --git a/theme.json b/theme.json index 91b58ff5..6fdabbdc 100644 --- a/theme.json +++ b/theme.json @@ -575,6 +575,14 @@ "lineHeight": "var( --wp--custom--line-height--small )" } }, + "core/post-content": { + "spacing": { + "padding": { + "left": "var( --wp--preset--spacing--30 )", + "right": "var( --wp--preset--spacing--30 )" + } + } + }, "core/post-date": { "color": { "text": "var( --wp--preset--color--contrast-3 )" From 3e4c73871ff99e79600217c457dfe85b5df4041d Mon Sep 17 00:00:00 2001 From: Thomas Guillot Date: Wed, 19 Jun 2024 15:19:36 +0100 Subject: [PATCH 23/39] fix(post-meta): use block registry for conditional content (#194) --- patterns/post-meta-multiple-lines-avatar.php | 11 ++++++----- patterns/post-meta-multiple-lines.php | 7 ++++--- patterns/post-meta-single-line-avatar.php | 11 ++++++----- patterns/post-meta-single-line.php | 11 ++++++----- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/patterns/post-meta-multiple-lines-avatar.php b/patterns/post-meta-multiple-lines-avatar.php index daa86d8a..63b7b47f 100644 --- a/patterns/post-meta-multiple-lines-avatar.php +++ b/patterns/post-meta-multiple-lines-avatar.php @@ -9,15 +9,16 @@ * @package Newspack_Block_Theme */ +$registry = WP_Block_Type_Registry::get_instance(); ?>
- +
- - +get_registered( 'co-authors-plus/coauthors' ) ) : ?> +
@@ -31,7 +32,7 @@
- +get_registered( 'co-authors-plus/coauthors' ) ) : ?>
@@ -47,7 +48,7 @@
- +get_registered( 'jetpack/sharing-buttons' ) ) : ?>