style: fix focus styling

elastic · Nov 12, 2020 · 5b842fe · 5b842fe
1 parent ec97027
commit 5b842fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/components/legend/_legend.scss b/src/components/legend/_legend.scss
@@ -2,7 +2,7 @@
   &--top,
   &--bottom {
     .echLegendList {
-      display: grid;
+      display: flex;
       grid-column-gap: $echLegendColumnGap;
       grid-row-gap: $echLegendRowGap;
       margin-top: $echLegendRowGap;
@@ -19,6 +19,7 @@
   &--right {
     .echLegendList {
       flex-direction: column;
+      width: 100%;
     }
   }
 
@@ -37,17 +38,16 @@
     position: relative;
   }
 
-  :focus {
-    box-shadow: inset 0 0 0 $euiSizeXS / 4 $euiFocusRingColor;
-  }
-
   .echLegendListContainer {
     @include euiYScrollWithShadows;
     width: 100%;
     overflow-y: auto;
-  }
 
-  &:focus {
-    box-shadow: inset 0 0 0 $euiSizeXS / 4 $euiFocusRingColor;
+    :focus {
+      @include euiFocusRing;
+      background-color: $euiFocusBackgroundColor;
+      border-radius: $euiBorderRadius / 2;
+      margin-right: $euiSizeXS;
+    }
   }
 }
diff --git a/src/components/legend/_legend_item.scss b/src/components/legend/_legend_item.scss
@@ -8,10 +8,6 @@ $legendItemVerticalPadding: $echLegendRowGap / 2;
   align-items: center;
   width: 100%;
 
-  &:focus {
-    box-shadow: inset 0 0 0 $euiSizeXS / 4 $euiFocusRingColor;
-  }
-
   &:not(&--hidden) {
     .echLegendItem__color--changable {
       cursor: pointer;
@@ -35,6 +31,7 @@ $legendItemVerticalPadding: $echLegendRowGap / 2;
 
   &__color {
     margin-right: $euiSizeXS;
+    margin-left: $euiSizeXS;
 
     .euiPopover {
       vertical-align: inherit; // prevents color dot from shifting
@@ -53,7 +50,7 @@ $legendItemVerticalPadding: $echLegendRowGap / 2;
     @include euiFontSizeXS;
     @include euiTextTruncate;
     flex: 1 1 auto;
-    width: 100%;
+    width: $echLegendMaxWidth;
     text-align: left;
     overflow-x: scroll;
     overflow: hidden;