From 87b4f069dc87111cff368fd520fbd756f6c77cc1 Mon Sep 17 00:00:00 2001
From: Robert Knight <robert@microbit.org>
Date: Thu, 21 Nov 2024 14:57:19 +0000
Subject: [PATCH 1/2] Fixes for Windows high contrast modes

---
 src/components/AppLogo.tsx           | 5 +++--
 src/components/DataSamplesMenu.tsx   | 3 ++-
 src/components/DefaultPageLayout.tsx | 3 ++-
 src/components/HelpMenu.tsx          | 3 ++-
 src/components/SettingsMenu.tsx      | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/AppLogo.tsx b/src/components/AppLogo.tsx
index 6af0b277c..981079891 100644
--- a/src/components/AppLogo.tsx
+++ b/src/components/AppLogo.tsx
@@ -13,11 +13,12 @@ const AppLogo = ({ color = "#FFF", ...props }: AppLogoProps) => {
       userSelect="none"
       transform="scale(0.93)"
       transformOrigin="left"
+      color="white"
       {...props}
     >
       {OrgLogo && (
         <>
-          <OrgLogo color="white" />
+          <OrgLogo />
           <Divider
             aria-hidden
             borderColor={color}
@@ -27,7 +28,7 @@ const AppLogo = ({ color = "#FFF", ...props }: AppLogoProps) => {
           />
         </>
       )}
-      <AppLogo h="19px" color="white" />
+      <AppLogo h="19px" />
     </HStack>
   );
 };
diff --git a/src/components/DataSamplesMenu.tsx b/src/components/DataSamplesMenu.tsx
index 01ac2bcac..6430e30de 100644
--- a/src/components/DataSamplesMenu.tsx
+++ b/src/components/DataSamplesMenu.tsx
@@ -112,8 +112,9 @@ const DataSamplesMenu = () => {
           aria-label={intl.formatMessage({
             id: "data-actions-menu",
           })}
+          color="gray.800"
           variant="ghost"
-          icon={<Icon as={MdMoreVert} color="gray.800" boxSize={7} />}
+          icon={<Icon as={MdMoreVert} boxSize={7} />}
           isRound
         />
         <Portal>
diff --git a/src/components/DefaultPageLayout.tsx b/src/components/DefaultPageLayout.tsx
index 66ef66704..5553d0d09 100644
--- a/src/components/DefaultPageLayout.tsx
+++ b/src/components/DefaultPageLayout.tsx
@@ -223,7 +223,8 @@ export const HomeToolbarItem = () => {
   return (
     <IconButton
       onClick={handleHomeClick}
-      icon={<RiHome2Line size={24} color="white" />}
+      color="white"
+      icon={<RiHome2Line size={24} />}
       aria-label={intl.formatMessage({ id: "homepage" })}
       variant="plain"
       size="lg"
diff --git a/src/components/HelpMenu.tsx b/src/components/HelpMenu.tsx
index af9c08fb8..f135f4901 100644
--- a/src/components/HelpMenu.tsx
+++ b/src/components/HelpMenu.tsx
@@ -47,7 +47,8 @@ const HelpMenu = ({ ...rest }: HelpMenuProps) => {
           fontSize="2xl"
           h={12}
           w={12}
-          icon={<RiQuestionLine fill="white" size={24} />}
+          color="white"
+          icon={<RiQuestionLine size={24} />}
           variant="plain"
           isRound
           _focusVisible={{
diff --git a/src/components/SettingsMenu.tsx b/src/components/SettingsMenu.tsx
index da990115a..f7bf51ff2 100644
--- a/src/components/SettingsMenu.tsx
+++ b/src/components/SettingsMenu.tsx
@@ -28,7 +28,8 @@ const SettingsMenu = () => {
           aria-label={intl.formatMessage({ id: "settings-menu-action" })}
           size="lg"
           fontSize="2xl"
-          icon={<RiSettings2Line fill="white" size={24} />}
+          color="white"
+          icon={<RiSettings2Line size={24} />}
           variant="plain"
           isRound
           h={12}

From 07ae745071080e44388033fcdb5a0cda790adc39 Mon Sep 17 00:00:00 2001
From: Robert Knight <robert@microbit.org>
Date: Thu, 21 Nov 2024 14:58:42 +0000
Subject: [PATCH 2/2] Missed one

---
 src/components/ToolbarMenu.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ToolbarMenu.tsx b/src/components/ToolbarMenu.tsx
index 12898ee76..07bbaf540 100644
--- a/src/components/ToolbarMenu.tsx
+++ b/src/components/ToolbarMenu.tsx
@@ -30,7 +30,8 @@ const ToolbarMenu = ({
         <MenuButton
           as={IconButton}
           aria-label={label}
-          icon={icon ?? <RiMenuLine size={24} color="white" />}
+          color="white"
+          icon={icon ?? <RiMenuLine size={24} />}
           variant={variant}
           size="lg"
           fontSize="xl"