chore: Merge support into master (#2943)

Co-authored-by: @josh-bagwell <[email protected]> Co-authored-by: manuel.carrera <[email protected]>
Workday · Oct 2, 2024 · fafcc58 · fafcc58
2 parents 0c48e7e + 602ff3a
commit fafcc58
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [v10.3.62](https://github.com/Workday/canvas-kit/releases/tag/v10.3.62) (2024-10-02)
+
+### Components
+
+- fix: Update BaseButton to use correct theming color for focus ring ([#2942](https://github.com/Workday/canvas-kit/pull/2942)) ([@josh-bagwell](https://github.com/josh-bagwell))
+  Fixes theming for the `BaseButton` within `Pagination`.
 ## [v11.1.13](https://github.com/Workday/canvas-kit/releases/tag/v11.1.13) (2024-09-19)
 
 ### Components

diff --git a/modules/react/button/lib/BaseButton.tsx b/modules/react/button/lib/BaseButton.tsx
@@ -189,7 +189,7 @@ export const buttonStencil = createStencil({
         ),
         outerColor: cssVar(
           buttonColorPropVars.focus.boxShadowOuter,
-          cssVar(boxShadowOuter, brand.primary.base)
+          cssVar(boxShadowOuter, brand.common.focusOutline)
         ),
       }),
     },

diff --git a/modules/styling/package.json b/modules/styling/package.json
@@ -54,8 +54,8 @@
     "@emotion/serialize": "^1.0.2",
     "@emotion/styled": "^11.6.0",
     "@workday/canvas-kit-react": "^11.1.13",
-    "@workday/canvas-system-icons-web": "^3.0.0",
     "@workday/canvas-tokens-web": "^2.0.0",
+    "@workday/canvas-system-icons-web": "^3.0.0",
     "typescript": "4.2"
   }
 }