Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 18 insertions, 3 deletions

diff --git a/toolkit/themes/shared/design-system/design-tokens.json b/toolkit/themes/shared/design-system/design-tokens.json
index c807335942..bdccc1feb9 100644
--- a/toolkit/themes/shared/design-system/design-tokens.json
+++ b/toolkit/themes/shared/design-system/design-tokens.json
@@ -681,7 +681,10 @@
         "value": "{focus.outline.width} solid {focus.outline.color}"
       },
       "color": {
-        "value": "{color.accent.primary.@base}"
+        "value": {
+          "default": "{color.accent.primary.@base}",
+          "forcedColors": "{text.color.@base}"
+        }
       },
       "inset": {
         "value": "calc(-1 * {focus.outline.width})"
diff --git a/toolkit/themes/shared/design-system/tokens-shared.css b/toolkit/themes/shared/design-system/tokens-shared.css
index 42b33f5e0d..c10c1c5295 100644
--- a/toolkit/themes/shared/design-system/tokens-shared.css
+++ b/toolkit/themes/shared/design-system/tokens-shared.css
@@ -279,6 +279,9 @@
       --color-accent-primary: ButtonText;
       --color-accent-primary-hover: SelectedItem;
       --color-accent-primary-active: var(--color-accent-primary-hover);
+
+      /** Focus Outline **/
+      --focus-outline-color: var(--text-color);
     }
   }
 }
diff --git a/toolkit/themes/shared/design-system/tokens-storybook.mjs b/toolkit/themes/shared/design-system/tokens-storybook.mjs
index fd2ea174c6..483a090ef9 100644
--- a/toolkit/themes/shared/design-system/tokens-storybook.mjs
+++ b/toolkit/themes/shared/design-system/tokens-storybook.mjs
@@ -605,7 +605,13 @@ export const storybookTables = {
       value: "var(--focus-outline-width) solid var(--focus-outline-color)",
       name: "--focus-outline",
     },
-    { value: "var(--color-accent-primary)", name: "--focus-outline-color" },
+    {
+      value: {
+        default: "var(--color-accent-primary)",
+        forcedColors: "var(--text-color)",
+      },
+      name: "--focus-outline-color",
+    },
     {
       value: "calc(-1 * var(--focus-outline-width))",
       name: "--focus-outline-inset",
@@ -1055,7 +1061,10 @@ export const variableLookupTable = {
   },
   "focus-outline":
     "var(--focus-outline-width) solid var(--focus-outline-color)",
-  "focus-outline-color": "var(--color-accent-primary)",
+  "focus-outline-color": {
+    default: "var(--color-accent-primary)",
+    forcedColors: "var(--text-color)",
+  },
   "focus-outline-inset": "calc(-1 * var(--focus-outline-width))",
   "focus-outline-offset": "2px",
   "focus-outline-width": "2px",