Tiny PR: Fix cookie consent default content and CSS (#29251)

Automattic · Mar 2, 2023 · d3c6ba9 · d3c6ba9
1 parent b8fd51f
commit d3c6ba9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/projects/plugins/jetpack/changelog/fix-cookie-consent-block 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
@@ -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: <a href=https://automattic.com/cookies/>Cookie Policy</a>.',
+			'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>.',
 			'jetpack'
 		),
 	},

diff --git 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
@@ -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;
 	}