Fixing shadow merge

elastic · Apr 2, 2018 · c6c34b2 · c6c34b2
1 parent 5c0a16f
commit c6c34b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/components/form/_mixins.scss b/src/components/form/_mixins.scss
@@ -32,14 +32,14 @@
 
 @mixin euiFormControlDefaultShadow {
   box-shadow:
-    0 2px 2px -1px rgba(0, 0, 0, 0.1),
+    0 2px 2px -1px rgba($euiShadowColor, 0.2),
     0 0 0 1px transparentize($euiColorFullShade, .92),
     inset #{-$euiFormMaxWidth} 0 0 0 $euiFormBackgroundColor;
 }
 
 @mixin euiFormControlInvalidStyle {
   box-shadow:
-    0 $euiSizeXS $euiSizeXS (-$euiSizeXS / 2) rgba(0, 0, 0, 0.1),
+    0 $euiSizeXS $euiSizeXS (-$euiSizeXS / 2) rgba($euiShadowColor, 0.2),
     0 0 0 1px transparentize($euiColorFullShade, .84),
     inset 0 0 0 0 $euiColorEmptyShade,
     inset 0 (-$euiSizeXS / 2) 0 0 $euiColorDanger;
@@ -48,7 +48,7 @@
 @mixin euiFormControlFocusStyle {
   background: tintOrShade($euiColorEmptyShade, 0%, 20%);
   box-shadow:
-    0 4px 4px -2px rgba(0, 0, 0, 0.1),
+    0 4px 4px -2px rgba($euiShadowColor, 0.2),
     0 0 0 1px transparentize($euiColorFullShade, .84),
     inset 0 0 0 0 tintOrShade($euiColorEmptyShade, 0%, 20%),
     inset 0 -2px 0 0 $euiColorPrimary;
@@ -110,7 +110,7 @@
 
   border: 1px solid shadeOrTint($euiColorLightestShade, 18%, 30%);
   background: $euiColorEmptyShade no-repeat center;
-  box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.1);
+  @include euiSlightShadow;
 
   @if $type == 'round' {
     border-radius: $size;

diff --git a/src/components/key_pad_menu/_key_pad_menu.scss b/src/components/key_pad_menu/_key_pad_menu.scss
@@ -28,7 +28,7 @@
 
   &:hover, &:focus {
     border-color: $euiBorderColor;
-    @include euiSlightShadowHover;
+    @include euiSlightShadow;
 
     .euiKeyPadMenuItem__icon {
       transform: translateY(0);