From d3c6ba9c41a5a3cdc3c6a99b2d79505dac75e90b Mon Sep 17 00:00:00 2001 From: Omar Alshaker Date: Thu, 2 Mar 2023 14:59:03 +0100 Subject: [PATCH] Tiny PR: Fix cookie consent default content and CSS (#29251) --- projects/plugins/jetpack/changelog/fix-cookie-consent-block | 4 ++++ .../jetpack/extensions/blocks/cookie-consent/attributes.js | 2 +- .../jetpack/extensions/blocks/cookie-consent/common.scss | 2 -- .../jetpack/extensions/blocks/cookie-consent/style.scss | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 projects/plugins/jetpack/changelog/fix-cookie-consent-block diff --git a/projects/plugins/jetpack/changelog/fix-cookie-consent-block b/projects/plugins/jetpack/changelog/fix-cookie-consent-block new file mode 100644 index 0000000000000..569af6c1a13c0 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-cookie-consent-block @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +Pre-escape the ampersand in the default content of the cookie consent block diff --git a/projects/plugins/jetpack/extensions/blocks/cookie-consent/attributes.js b/projects/plugins/jetpack/extensions/blocks/cookie-consent/attributes.js index bdd75f41b7242..5b1a21f446af3 100644 --- a/projects/plugins/jetpack/extensions/blocks/cookie-consent/attributes.js +++ b/projects/plugins/jetpack/extensions/blocks/cookie-consent/attributes.js @@ -6,7 +6,7 @@ export default { source: 'html', selector: 'p', default: __( - 'Privacy & 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: Cookie Policy.', + 'Privacy & 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: Cookie Policy.', 'jetpack' ), }, diff --git a/projects/plugins/jetpack/extensions/blocks/cookie-consent/common.scss b/projects/plugins/jetpack/extensions/blocks/cookie-consent/common.scss index 450b712de8141..44ccef6e585ac 100644 --- a/projects/plugins/jetpack/extensions/blocks/cookie-consent/common.scss +++ b/projects/plugins/jetpack/extensions/blocks/cookie-consent/common.scss @@ -2,8 +2,6 @@ .wp-block-jetpack-cookie-consent { position: fixed; bottom: 50px; - transition: opacity 1s ease-in-out; - animation: cookie-consent-slide-in 0.5s ease-in-out; z-index: 50001; display: flex; justify-content: space-between; diff --git a/projects/plugins/jetpack/extensions/blocks/cookie-consent/style.scss b/projects/plugins/jetpack/extensions/blocks/cookie-consent/style.scss index e752e9305360e..ba3c7f6888f51 100644 --- a/projects/plugins/jetpack/extensions/blocks/cookie-consent/style.scss +++ b/projects/plugins/jetpack/extensions/blocks/cookie-consent/style.scss @@ -1,6 +1,9 @@ @import './common'; .wp-block-jetpack-cookie-consent:not([role='document']) { + transition: opacity 0.2s ease-in-out; + animation: cookie-consent-slide-in 0.2s ease-in-out; + span { display: none; }