Merge branch 'main' into datagrid/3151/4456

elastic · Jan 14, 2022 · 9d950a9 · 9d950a9
2 parents 91b0e00 + 3f617e1
commit 9d950a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 **Bug fixes**
 
+- Updated the outline color in `euiCustomControlFocused` mixin to use `$euiFocusRingColor` instead of `currentColor` ([#5479](https://github.com/elastic/eui/pull/5479))
 - Fixed keyboard navigation in `EuiDataGrid` not fully scrolling cells into view ([#5515](https://github.com/elastic/eui/pull/5515))
 
 ## [`45.0.0`](https://github.com/elastic/eui/tree/v45.0.0)
@@ -262,6 +263,14 @@
 
 - Renamed `tokenKeyword` icon to `tokenTag` in `EuiToken` ([#5251](https://github.com/elastic/eui/pull/5251))
 
+## [`39.1.4`](https://github.com/elastic/eui/tree/v39.1.4)
+
+**Note: this release is a backport containing changes originally made in `44.0.0`**
+
+**Deprecations**
+
+- Deprecated `PartitionConfig` in favor of inclusion in Charts `theme.partition` ([#5492](https://github.com/elastic/eui/pull/5492)).
+
 ## [`39.1.3`](https://github.com/elastic/eui/tree/v39.1.2)
 
 **Note: this release is a backport containing changes originally made after `42.0.0`**

diff --git a/src/global_styling/mixins/_form.scss b/src/global_styling/mixins/_form.scss
@@ -344,13 +344,14 @@
   // Requires a selector to work with the Amsterdam outline styles
   @if ($amsterdamSelector) {
     + #{$amsterdamSelector} {
-      outline: $euiFocusRingSize solid currentColor;
+      outline: $euiFocusRingSize solid $euiFocusRingColor;
+      outline-offset: 2px;
     }
 
     // Chrome
     &:focus-visible + #{$amsterdamSelector} {
-      outline-style: auto;
-      outline-offset: 3px;
+      outline: $euiFocusRingSize solid $euiFocusRingColor;
+      outline-offset: 2px;
     }
 
     &:not(:focus-visible) + #{$amsterdamSelector} {