Merge branch 'master' into motion-fixes

carbon-design-system · Apr 26, 2019 · efb3b33 · efb3b33
2 parents 84ebee2 + c0a6dde
commit efb3b33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/components/accordion/_accordion.scss b/src/components/accordion/_accordion.scss
@@ -65,7 +65,7 @@
     }
 
     &:focus:before {
-      @include focus-outline('outline');
+      @include focus-outline('outline-compat');
     }
   }
 

diff --git a/src/globals/scss/_helper-mixins.scss b/src/globals/scss/_helper-mixins.scss
@@ -86,6 +86,11 @@
     outline-offset: -2px;
   }
 
+  @if ($type == 'outline-compat') {
+    border: 2px solid $focus;
+    box-sizing: border-box;
+  }
+
   @if ($type == 'invalid') {
     outline: 2px solid $support-01;
     outline-offset: -2px;

diff --git a/src/globals/scss/_theme-tokens.scss b/src/globals/scss/_theme-tokens.scss
@@ -200,7 +200,7 @@
   /// @type Color
   /// @access public
   /// @group data-table
-  $data-table-zebra-color: #fcfcfc !default !global;
+  $data-table-zebra-color: $ui-02 !default !global;
 
   /// @type Color
   /// @access public
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ @@
         }
         &:focus:before {
-          @include focus-outline('outline');
+          @include focus-outline('outline-compat');
         }
       }
@@ Expand Down @@