Skip to content

Cookie Consent Block: add fallback colors for styles #45287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Cookie Consent Block: add fallback colors for styles #45287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e59e18d
Cookie Consent Block: add fallback colors for styles
jeherve Sep 24, 2025
d7db109
Update tests
jeherve Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/fix-cookie-consent-block-color-fallback
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: compat

Cookie Consent Block: ensure we always have a default set of colors to style the block when theme colors are not available.
6 changes: 3 additions & 3 deletions projects/plugins/jetpack/extensions/blocks/cookie-consent/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"type": "object",
"default": {
"color": {
"text": "var(--wp--preset--color--contrast)",
"background": "var(--wp--preset--color--tertiary)",
"link": "var(--wp--preset--color--contrast)"
"text": "var(--wp--preset--color--contrast, #000000)",
"background": "var(--wp--preset--color--tertiary, #f0f0f0)",
"link": "var(--wp--preset--color--contrast, #000000)"
},
"spacing": {
"padding": {
Expand Down
2 changes: 1 addition & 1 deletion ...ugins/jetpack/extensions/blocks/cookie-consent/test/fixtures/jetpack__cookie-consent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- wp:jetpack/cookie-consent -->
<div class="wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background" style="color:var(--wp--preset--color--contrast);background-color:var(--wp--preset--color--tertiary);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em" role="dialog" aria-modal="true"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href="https://automattic.com/cookies/">Cookie Policy</a>.</p><!-- wp:button -->
<div class="wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background" style="color:var(--wp--preset--color--contrast, #000000);background-color:var(--wp--preset--color--tertiary, #f0f0f0);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em" role="dialog" aria-modal="true"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href="https://automattic.com/cookies/">Cookie Policy</a>.</p><!-- wp:button -->
<div class="wp-block-button"><a class="wp-block-button__link wp-element-button">Accept</a></div>
<!-- /wp:button --><span>365</span></div>
<!-- /wp:jetpack/cookie-consent -->
8 changes: 4 additions & 4 deletions ...ugins/jetpack/extensions/blocks/cookie-consent/test/fixtures/jetpack__cookie-consent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"text": "Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.",
"style": {
"color": {
"text": "var(--wp--preset--color--contrast)",
"background": "var(--wp--preset--color--tertiary)",
"link": "var(--wp--preset--color--contrast)"
"text": "var(--wp--preset--color--contrast, #000000)",
"background": "var(--wp--preset--color--tertiary, #f0f0f0)",
"link": "var(--wp--preset--color--contrast, #000000)"
},
"spacing": {
"padding": {
Expand All @@ -25,6 +25,6 @@
"showOverlay": false
},
"innerBlocks": [],
"originalContent": "<div class=\"wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background\" style=\"color:var(--wp--preset--color--contrast);background-color:var(--wp--preset--color--tertiary);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em\" role=\"dialog\" aria-modal=\"true\"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.</p><span>365</span></div>"
"originalContent": "<div class=\"wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background\" style=\"color:var(--wp--preset--color--contrast, #000000);background-color:var(--wp--preset--color--tertiary, #f0f0f0);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em\" role=\"dialog\" aria-modal=\"true\"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.</p><span>365</span></div>"
}
]
4 changes: 2 additions & 2 deletions ...etpack/extensions/blocks/cookie-consent/test/fixtures/jetpack__cookie-consent.parsed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
]
}
],
"innerHTML": "\n<div class=\"wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background\" style=\"color:var(--wp--preset--color--contrast);background-color:var(--wp--preset--color--tertiary);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em\" role=\"dialog\" aria-modal=\"true\"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.</p><span>365</span></div>\n",
"innerHTML": "\n<div class=\"wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background\" style=\"color:var(--wp--preset--color--contrast, #000000);background-color:var(--wp--preset--color--tertiary, #f0f0f0);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em\" role=\"dialog\" aria-modal=\"true\"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.</p><span>365</span></div>\n",
"innerContent": [
"\n<div class=\"wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background\" style=\"color:var(--wp--preset--color--contrast);background-color:var(--wp--preset--color--tertiary);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em\" role=\"dialog\" aria-modal=\"true\"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.</p>",
"\n<div class=\"wp-block-jetpack-cookie-consent alignwide has-text-color has-background has-text-color has-background\" style=\"color:var(--wp--preset--color--contrast, #000000);background-color:var(--wp--preset--color--tertiary, #f0f0f0);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em\" role=\"dialog\" aria-modal=\"true\"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href=\"https://automattic.com/cookies/\">Cookie Policy</a>.</p>",
null,
"<span>365</span></div>\n"
]
Expand Down
2 changes: 1 addition & 1 deletion ...ck/extensions/blocks/cookie-consent/test/fixtures/jetpack__cookie-consent.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- wp:jetpack/cookie-consent -->
<div class="wp-block-jetpack-cookie-consent alignwide has-text-color has-background" style="color:var(--wp--preset--color--contrast);background-color:var(--wp--preset--color--tertiary);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em" role="dialog" aria-modal="true"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href="https://automattic.com/cookies/">Cookie Policy</a>.</p><span>365</span></div>
<div class="wp-block-jetpack-cookie-consent alignwide has-text-color has-background" style="color:var(--wp--preset--color--contrast, #000000);background-color:var(--wp--preset--color--tertiary, #f0f0f0);padding-top:1em;padding-right:1em;padding-bottom:1em;padding-left:1em" role="dialog" aria-modal="true"><p>Privacy &amp; Cookies: This site uses cookies. By continuing to use this website, you agree to their use. To find out more, including how to control cookies, see here: <a href="https://automattic.com/cookies/">Cookie Policy</a>.</p><span>365</span></div>
<!-- /wp:jetpack/cookie-consent -->
Loading