From fbbdf5ffe5fb76cf4f0ecadd8acf88da3c27c5cf Mon Sep 17 00:00:00 2001
From: kodster28 <kody@cloudflare.com>
Date: Tue, 27 May 2025 08:16:39 -0500
Subject: [PATCH 1/4] [Chore] Update cookie preference icon

---
 src/assets/privacyoptions.svg | 33 +++++++++++++++++++++++++++++++++
 src/components/OneTrust.astro |  5 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/privacyoptions.svg

diff --git a/src/assets/privacyoptions.svg b/src/assets/privacyoptions.svg
new file mode 100644
index 000000000000000..865328bc7ccde73
--- /dev/null
+++ b/src/assets/privacyoptions.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 14" style="enable-background:new 0 0 30 14;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#0066FF;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#0066FF;}
+</style>
+<g>
+	<g id="final---dec.11-2020_1_">
+		<g id="_x30_208-our-toggle_2_" transform="translate(-1275.000000, -200.000000)">
+			<g id="Final-Copy-2_2_" transform="translate(1275.000000, 200.000000)">
+				<path class="st0" d="M7.4,12.8h6.8l3.1-11.6H7.4C4.2,1.2,1.6,3.8,1.6,7S4.2,12.8,7.4,12.8z"/>
+			</g>
+		</g>
+	</g>
+	<g id="final---dec.11-2020">
+		<g id="_x30_208-our-toggle" transform="translate(-1275.000000, -200.000000)">
+			<g id="Final-Copy-2" transform="translate(1275.000000, 200.000000)">
+				<path class="st1" d="M22.6,0H7.4c-3.9,0-7,3.1-7,7s3.1,7,7,7h15.2c3.9,0,7-3.1,7-7S26.4,0,22.6,0z M1.6,7c0-3.2,2.6-5.8,5.8-5.8
+					h9.9l-3.1,11.6H7.4C4.2,12.8,1.6,10.2,1.6,7z"/>
+				<path id="x" class="st2" d="M24.6,4c0.2,0.2,0.2,0.6,0,0.8l0,0L22.5,7l2.2,2.2c0.2,0.2,0.2,0.6,0,0.8c-0.2,0.2-0.6,0.2-0.8,0
+					l0,0l-2.2-2.2L19.5,10c-0.2,0.2-0.6,0.2-0.8,0c-0.2-0.2-0.2-0.6,0-0.8l0,0L20.8,7l-2.2-2.2c-0.2-0.2-0.2-0.6,0-0.8
+					c0.2-0.2,0.6-0.2,0.8,0l0,0l2.2,2.2L23.8,4C24,3.8,24.4,3.8,24.6,4z"/>
+				<path id="y" class="st3" d="M12.7,4.1c0.2,0.2,0.3,0.6,0.1,0.8l0,0L8.6,9.8C8.5,9.9,8.4,10,8.3,10c-0.2,0.1-0.5,0.1-0.7-0.1l0,0
+					L5.4,7.7c-0.2-0.2-0.2-0.6,0-0.8c0.2-0.2,0.6-0.2,0.8,0l0,0L8,8.6l3.8-4.5C12,3.9,12.4,3.9,12.7,4.1z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/components/OneTrust.astro b/src/components/OneTrust.astro
index 12882083daa9aee..933711ccab98cac 100644
--- a/src/components/OneTrust.astro
+++ b/src/components/OneTrust.astro
@@ -17,7 +17,10 @@ const uuid = isProduction
 	function OptanonWrapper() {}
 </script>
 <!-- OneTrust Cookies Settings button start -->
-<button id="ot-sdk-btn" class="ot-sdk-show-settings">Cookie Settings</button>
+<button id="ot-sdk-btn" class="ot-sdk-show-settings">
+	<img class="w4 mr1" src="/privacyoptions.svg" alt="privacy options" />Cookie
+	Settings</button
+>
 <!-- OneTrust Cookies Settings button end -->
 
 <style>

From 21c658b1dfa56cc07f202fc8e5ceaa999635a00b Mon Sep 17 00:00:00 2001
From: kodster28 <kody@cloudflare.com>
Date: Tue, 27 May 2025 08:29:05 -0500
Subject: [PATCH 2/4] Testing

---
 src/components/OneTrust.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OneTrust.astro b/src/components/OneTrust.astro
index 933711ccab98cac..0863a0a9cdb2e3d 100644
--- a/src/components/OneTrust.astro
+++ b/src/components/OneTrust.astro
@@ -3,7 +3,7 @@ const isProduction = import.meta.env.PROD;
 
 const uuid = isProduction
 	? "b1e05d49-f072-4bae-9116-bdb78af15448"
-	: "b1e05d49-f072-4bae-9116-bdb78af15448-test";
+	: "b1e05d49-f072-4bae-9116-bdb78af15448";
 ---
 
 <script

From 86e4ad548e25b3ccaa965b29c6fea6197f60cf5b Mon Sep 17 00:00:00 2001
From: kodster28 <kody@cloudflare.com>
Date: Tue, 27 May 2025 08:59:47 -0500
Subject: [PATCH 3/4] Updates

---
 src/components/OneTrust.astro         | 10 +++++-----
 src/components/overrides/Footer.astro |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/OneTrust.astro b/src/components/OneTrust.astro
index 0863a0a9cdb2e3d..d82766982fa076e 100644
--- a/src/components/OneTrust.astro
+++ b/src/components/OneTrust.astro
@@ -1,4 +1,6 @@
 ---
+import { Image } from "astro:assets";
+import PrivacyChoicesImage from "~/assets/privacyoptions.svg";
 const isProduction = import.meta.env.PROD;
 
 const uuid = isProduction
@@ -10,17 +12,15 @@ const uuid = isProduction
 	src="https://ot.www.cloudflare.com/public/vendor/onetrust/scripttemplates/otSDKStub.js"
 	type="text/javascript"
 	charset="UTF-8"
-	data-domain-script={uuid}
+	data-domain-script="b1e05d49-f072-4bae-9116-bdb78af15448"
 	is:inline></script>
 <script type="text/javascript" is:inline>
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	function OptanonWrapper() {}
 </script>
 <!-- OneTrust Cookies Settings button start -->
-<button id="ot-sdk-btn" class="ot-sdk-show-settings">
-	<img class="w4 mr1" src="/privacyoptions.svg" alt="privacy options" />Cookie
-	Settings</button
->
+<Image src={PrivacyChoicesImage} alt="privacy options" />
+<button id="ot-sdk-btn" class="ot-sdk-show-settings"> Cookie Settings</button>
 <!-- OneTrust Cookies Settings button end -->
 
 <style>
diff --git a/src/components/overrides/Footer.astro b/src/components/overrides/Footer.astro
index b5318fdb565466c..49010ccc56b8538 100644
--- a/src/components/overrides/Footer.astro
+++ b/src/components/overrides/Footer.astro
@@ -90,7 +90,7 @@ if (
 }
 {!splash && <Default />}
 <div class="w-full">
-	<div class="grid grid-cols-2 gap-8 pb-10 pt-6 lg:grid-cols-5">
+	<div class="grid grid-cols-2 gap-8 pt-6 pb-10 lg:grid-cols-5">
 		{
 			groups.map(([title, items]) => (
 				<ul class="flex w-full list-none flex-col gap-3 pl-0">
@@ -114,7 +114,7 @@ if (
 	</div>
 	<div>
 		<ul
-			class="flex list-inside flex-wrap items-center justify-center gap-3 gap-y-4 pl-0 text-xs text-cl1-gray-4! dark:text-cl1-gray-7!"
+			class="text-cl1-gray-4! dark:text-cl1-gray-7! flex list-inside flex-wrap items-center justify-center gap-3 gap-y-4 pl-0 text-xs"
 		>
 			<li class="list-none">2025 Cloudflare, Inc.</li>
 			{
@@ -122,7 +122,7 @@ if (
 					<li>
 						<a
 							href={href}
-							class="text-cl1-gray-4! no-underline dark:text-cl1-gray-7!"
+							class="text-cl1-gray-4! dark:text-cl1-gray-7! no-underline"
 						>
 							{text}
 						</a>
@@ -130,7 +130,7 @@ if (
 				))
 			}
 			{
-				isProduction && (
+				(
 					<li>
 						<OneTrust />
 					</li>

From 417478dc32ead48e9dee9e95122fd6f3455a1da5 Mon Sep 17 00:00:00 2001
From: Kian Newman-Hazel <kian@cloudflare.com>
Date: Mon, 2 Jun 2025 14:55:12 +0100
Subject: [PATCH 4/4] alignment + remove testing

---
 src/components/OneTrust.astro         | 11 +++++++----
 src/components/overrides/Footer.astro |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/OneTrust.astro b/src/components/OneTrust.astro
index d82766982fa076e..6bb991dedf81226 100644
--- a/src/components/OneTrust.astro
+++ b/src/components/OneTrust.astro
@@ -1,26 +1,29 @@
 ---
 import { Image } from "astro:assets";
 import PrivacyChoicesImage from "~/assets/privacyoptions.svg";
+
 const isProduction = import.meta.env.PROD;
 
 const uuid = isProduction
 	? "b1e05d49-f072-4bae-9116-bdb78af15448"
-	: "b1e05d49-f072-4bae-9116-bdb78af15448";
+	: "b1e05d49-f072-4bae-9116-bdb78af15448-test";
 ---
 
 <script
 	src="https://ot.www.cloudflare.com/public/vendor/onetrust/scripttemplates/otSDKStub.js"
 	type="text/javascript"
 	charset="UTF-8"
-	data-domain-script="b1e05d49-f072-4bae-9116-bdb78af15448"
+	data-domain-script={uuid}
 	is:inline></script>
 <script type="text/javascript" is:inline>
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	function OptanonWrapper() {}
 </script>
 <!-- OneTrust Cookies Settings button start -->
-<Image src={PrivacyChoicesImage} alt="privacy options" />
-<button id="ot-sdk-btn" class="ot-sdk-show-settings"> Cookie Settings</button>
+<div class="inline-flex items-center gap-2">
+	<Image src={PrivacyChoicesImage} alt="privacy options" height="12" />
+	<button id="ot-sdk-btn" class="ot-sdk-show-settings">Cookie Settings</button>
+</div>
 <!-- OneTrust Cookies Settings button end -->
 
 <style>
diff --git a/src/components/overrides/Footer.astro b/src/components/overrides/Footer.astro
index 49010ccc56b8538..cc32d00c9d3248b 100644
--- a/src/components/overrides/Footer.astro
+++ b/src/components/overrides/Footer.astro
@@ -130,7 +130,7 @@ if (
 				))
 			}
 			{
-				(
+				isProduction && (
 					<li>
 						<OneTrust />
 					</li>