Merge branch 'master' into upgrade-jest-25

carbon-design-system · Feb 27, 2020 · 1b3c84e · 1b3c84e
2 parents 5919656 + b46c84b
commit 1b3c84e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -5653,6 +5653,7 @@ $carbon--theme--g90: map-merge(
     visited-link: #be95ff,
     disabled-01: #393939,
     disabled-02: #6f6f6f,
+    disabled-03: #a8a8a8,
     highlight: #0043ce,
     skeleton-01: #353535,
     skeleton-02: #525252,

diff --git a/packages/elements/docs/sass.md b/packages/elements/docs/sass.md
@@ -5283,6 +5283,7 @@ $carbon--theme--g90: map-merge(
     visited-link: #be95ff,
     disabled-01: #393939,
     disabled-02: #6f6f6f,
+    disabled-03: #a8a8a8,
     highlight: #0043ce,
     skeleton-01: #353535,
     skeleton-02: #525252,

diff --git a/packages/themes/docs/sass.md b/packages/themes/docs/sass.md
@@ -1777,6 +1777,7 @@ $carbon--theme--g90: map-merge(
     visited-link: #be95ff,
     disabled-01: #393939,
     disabled-02: #6f6f6f,
+    disabled-03: #a8a8a8,
     highlight: #0043ce,
     skeleton-01: #353535,
     skeleton-02: #525252,

diff --git a/packages/themes/src/g100.js b/packages/themes/src/g100.js
@@ -120,7 +120,7 @@ export const visitedLink = purple40;
 
 export const disabled01 = gray90;
 export const disabled02 = gray70;
-export const disabled03 = gray60;
+export const disabled03 = gray50;
 
 export const highlight = blue80;
 

diff --git a/packages/themes/src/g90.js b/packages/themes/src/g90.js
@@ -18,6 +18,7 @@ import {
   // Gray
   gray10,
   gray30,
+  gray40,
   gray50,
   gray60,
   gray70,
@@ -121,7 +122,7 @@ export const visitedLink = purple40;
 
 export const disabled01 = gray80;
 export const disabled02 = gray60;
-export const disabled03 = gray50;
+export const disabled03 = gray40;
 
 export const highlight = blue70;