From b09712fcf0afda46fcf99ee3f9ea9589dc590a14 Mon Sep 17 00:00:00 2001 From: aagonzales Date: Wed, 15 Jan 2020 14:10:09 -0600 Subject: [PATCH 1/5] feat(token): add new $text-error --- packages/themes/src/g10.js | 1 + packages/themes/src/g100.js | 1 + packages/themes/src/g90.js | 3 ++- packages/themes/src/tokens.js | 1 + packages/themes/src/v9.js | 1 + packages/themes/src/white.js | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/themes/src/g10.js b/packages/themes/src/g10.js index db17037f9a37..ca4aee63b6a6 100644 --- a/packages/themes/src/g10.js +++ b/packages/themes/src/g10.js @@ -59,6 +59,7 @@ export const text02 = gray80; export const text03 = gray40; export const text04 = white; export const text05 = gray60; +export const textError = red60; export const icon01 = gray100; export const icon02 = gray70; diff --git a/packages/themes/src/g100.js b/packages/themes/src/g100.js index d374e834e408..ca7faf718f78 100644 --- a/packages/themes/src/g100.js +++ b/packages/themes/src/g100.js @@ -57,6 +57,7 @@ export const text02 = gray30; export const text03 = gray60; export const text04 = white; export const text05 = gray50; +export const textError = red40; export const icon01 = gray10; export const icon02 = gray30; diff --git a/packages/themes/src/g90.js b/packages/themes/src/g90.js index d8c7c4a17dfd..f0af3a35e26c 100644 --- a/packages/themes/src/g90.js +++ b/packages/themes/src/g90.js @@ -58,6 +58,7 @@ export const text02 = gray30; export const text03 = gray60; export const text04 = white; export const text05 = gray50; +export const textError = red30; export const icon01 = gray10; export const icon02 = gray30; @@ -73,7 +74,7 @@ export const field02 = gray70; export const inverse01 = gray100; export const inverse02 = gray10; -export const support01 = red50; +export const support01 = red40; export const support02 = green40; export const support03 = yellow; export const support04 = blue50; diff --git a/packages/themes/src/tokens.js b/packages/themes/src/tokens.js index 299ffcf00609..0c309a9c812f 100644 --- a/packages/themes/src/tokens.js +++ b/packages/themes/src/tokens.js @@ -30,6 +30,7 @@ const colors = [ 'text03', 'text04', 'text05', + 'textError', 'icon01', 'icon02', diff --git a/packages/themes/src/v9.js b/packages/themes/src/v9.js index 731e85d93f35..d2deb68083cb 100644 --- a/packages/themes/src/v9.js +++ b/packages/themes/src/v9.js @@ -24,6 +24,7 @@ export const text02 = '#5a6872'; export const text03 = '#cdd1d4'; export const text04 = white; export const text05 = '#5a6872'; +export const textError = '#e0182d'; export const icon01 = '#3d70b2'; export const icon02 = '#5a6872'; diff --git a/packages/themes/src/white.js b/packages/themes/src/white.js index d37833b9cc2c..dedf7a50ac8e 100644 --- a/packages/themes/src/white.js +++ b/packages/themes/src/white.js @@ -59,6 +59,8 @@ export const text02 = gray80; export const text03 = gray40; export const text04 = white; export const text05 = gray60; +export const textError = red60; + export const icon01 = gray100; export const icon02 = gray70; From 6eaf2dfb13bfb2ff3b88d5a4bfe4257ba0cbda97 Mon Sep 17 00:00:00 2001 From: aagonzales Date: Wed, 15 Jan 2020 14:27:56 -0600 Subject: [PATCH 2/5] updated import colors --- packages/themes/src/g100.js | 1 + packages/themes/src/g90.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/themes/src/g100.js b/packages/themes/src/g100.js index ca7faf718f78..4a0674e84e91 100644 --- a/packages/themes/src/g100.js +++ b/packages/themes/src/g100.js @@ -27,6 +27,7 @@ import { green40, green50, yellow, + red40, red50, red60, red80, diff --git a/packages/themes/src/g90.js b/packages/themes/src/g90.js index f0af3a35e26c..b6eb947d8868 100644 --- a/packages/themes/src/g90.js +++ b/packages/themes/src/g90.js @@ -28,6 +28,8 @@ import { green40, green50, yellow, + red30, + red40, red50, red60, red80, From 4cae6f2e1248a1b5fa650ab63da914e44c573549 Mon Sep 17 00:00:00 2001 From: aagonzales Date: Wed, 15 Jan 2020 15:12:07 -0600 Subject: [PATCH 3/5] Update g90.js --- packages/themes/src/g90.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/themes/src/g90.js b/packages/themes/src/g90.js index b6eb947d8868..780e1816dffe 100644 --- a/packages/themes/src/g90.js +++ b/packages/themes/src/g90.js @@ -30,7 +30,6 @@ import { yellow, red30, red40, - red50, red60, red80, purple40, From d107173cfdfd1b0992a92946cb3461d331ee2660 Mon Sep 17 00:00:00 2001 From: aagonzales Date: Wed, 15 Jan 2020 15:57:28 -0600 Subject: [PATCH 4/5] Update tokens.js --- packages/themes/src/tokens.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/themes/src/tokens.js b/packages/themes/src/tokens.js index 0c309a9c812f..800536600725 100644 --- a/packages/themes/src/tokens.js +++ b/packages/themes/src/tokens.js @@ -175,6 +175,7 @@ export const unstable__meta = { 'text03', 'text04', 'text05', + 'textError', 'link01', 'icon01', 'icon02', From 0cdf9e6ca21d1af3b04efbfb9cae3682d96233f8 Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Thu, 16 Jan 2020 11:01:51 -0800 Subject: [PATCH 5/5] chore(prettier): run prettier --- packages/themes/src/white.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/themes/src/white.js b/packages/themes/src/white.js index dedf7a50ac8e..eccee01a609c 100644 --- a/packages/themes/src/white.js +++ b/packages/themes/src/white.js @@ -61,7 +61,6 @@ export const text04 = white; export const text05 = gray60; export const textError = red60; - export const icon01 = gray100; export const icon02 = gray70; export const icon03 = white;