Merge branch 'master' into patch-1

carbon-design-system · Jul 9, 2020 · 8832c24 · 8832c24
2 parents 078ded1 + 0b3bfe0
commit 8832c24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -1,9 +1,6 @@
 # .kodiak.toml
-# Minimal config. version is the only required field.
 version = 1
 
-# Kodiak will only act on PRs that have this label.
+[merge]
 automerge_label = "status: ready to merge 🎉"
-
-# Choose merge method for Kodiak to use.
 method = "squash"
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -7335,6 +7335,7 @@ $support-02: if(
 - **Type**: `{undefined}`
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
+  - [inline-loading [mixin]](#inline-loading-mixin)
   - [inline-notifications [mixin]](#inline-notifications-mixin)
   - [toast-notifications [mixin]](#toast-notifications-mixin)
   - [toggle [mixin]](#toggle-mixin)
@@ -17983,7 +17984,7 @@ Inline loading styles
   }
 
   .#{$prefix}--inline-loading__checkmark-container {
-    fill: $interactive-04;
+    fill: $support-02;
 
     // For deprecated older markup
     &.#{$prefix}--inline-loading__svg {
@@ -18046,6 +18047,7 @@ Inline loading styles
   - [prefix [variable]](#prefix-variable)
   - [loading--small\_\_gap [variable]](#loading--small__gap-variable)
   - [text-02 [variable]](#text-02-variable)
+  - [support-02 [variable]](#support-02-variable)
   - [interactive-04 [variable]](#interactive-04-variable)
   - [support-01 [variable]](#support-01-variable)
 

diff --git a/packages/components/src/components/inline-loading/_inline-loading.scss b/packages/components/src/components/inline-loading/_inline-loading.scss
@@ -46,7 +46,7 @@
   }
 
   .#{$prefix}--inline-loading__checkmark-container {
-    fill: $interactive-04;
+    fill: $support-02;
 
     // For deprecated older markup
     &.#{$prefix}--inline-loading__svg {