Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(token): add new $text-error #5056

Merged
merged 13 commits into from
Jan 16, 2020
Merged

feat(token): add new $text-error #5056

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b09712f
feat(token): add new $text-error
aagonzales Jan 15, 2020
05732af
Merge branch 'master' into token-updates
aagonzales Jan 15, 2020
6eaf2df
updated import colors
aagonzales Jan 15, 2020
3f2ea54
Merge branch 'token-updates' of https://github.com/aagonzales/carbon …
aagonzales Jan 15, 2020
4cae6f2
Update g90.js
aagonzales Jan 15, 2020
d107173
Update tokens.js
aagonzales Jan 15, 2020
7092046
Merge branch 'master' into token-updates
aagonzales Jan 16, 2020
0cdf9e6
chore(prettier): run prettier
tw15egan Jan 16, 2020
672f902
Merge branch 'master' into token-updates
tw15egan Jan 16, 2020
5ccebba
Merge branch 'token-updates' of github.com:aagonzales/carbon into tok…
tw15egan Jan 16, 2020
15bd306
Merge branch 'master' into token-updates
tw15egan Jan 16, 2020
652c16d
Merge branch 'master' into token-updates
tw15egan Jan 16, 2020
d151c0c
Merge branch 'master' into token-updates
asudoh Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/themes/src/g10.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g100.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
green40,
green50,
yellow,
red40,
red50,
red60,
red80,
Expand Down Expand Up @@ -57,6 +58,7 @@ export const text02 = gray30;
export const text03 = gray60;
export const text04 = white;
export const text05 = gray50;
export const textError = red40;
aagonzales marked this conversation as resolved.
Show resolved Hide resolved

export const icon01 = gray10;
export const icon02 = gray30;
Expand Down
5 changes: 4 additions & 1 deletion packages/themes/src/g90.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import {
green40,
green50,
yellow,
red30,
red40,
red50,
aagonzales marked this conversation as resolved.
Show resolved Hide resolved
red60,
red80,
Expand Down Expand Up @@ -58,6 +60,7 @@ export const text02 = gray30;
export const text03 = gray60;
export const text04 = white;
export const text05 = gray50;
export const textError = red30;
aagonzales marked this conversation as resolved.
Show resolved Hide resolved

export const icon01 = gray10;
export const icon02 = gray30;
Expand All @@ -73,7 +76,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;
Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/tokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const colors = [
'text03',
'text04',
'text05',
'textError',

'icon01',
'icon02',
Expand Down
1 change: 1 addition & 0 deletions packages/themes/src/v9.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/white.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down