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(tokens): add layer interaction tokens #8714

Merged
merged 8 commits into from
May 19, 2021
Merged

feat(tokens): add layer interaction tokens #8714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8c75e8
feat(tokens): add layer interaction tokens
dakahn May 18, 2021
b65ac58
feat(tokens): add to meta category
dakahn May 18, 2021
5136393
Merge branch 'main' into 8687-layer-accent-tokens
dakahn May 18, 2021
b30a1a7
feat(tokens): add v9 layerAccent tokesn
dakahn May 19, 2021
9c27bb0
Merge branch '8687-layer-accent-tokens' of github.com:dakahn/carbon i…
dakahn May 19, 2021
4c9df59
Merge branch 'main' into 8687-layer-accent-tokens
kodiakhq[bot] May 19, 2021
4dda800
feat(tokens): add CORRECT v9 tokens
dakahn May 19, 2021
5670151
Merge branch '8687-layer-accent-tokens' of github.com:dakahn/carbon i…
dakahn May 19, 2021
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
2 changes: 2 additions & 0 deletions packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ Array [
"label02",
"layer",
"layerAccent",
"layerAccentActive",
"layerAccentHover",
"layerActive",
"layerDisabled",
"layerHover",
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g10.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ export const skeleton02 = gray30;
export const background = uiBackground;
export const layer = ui01;
export const layerAccent = ui03;
export const layerAccentActive = gray40;
export const layerAccentHover = adjustLightness(layerAccent, -6);
export const field = field01;
export const backgroundInverse = inverse02;
export const backgroundBrand = interactive01;
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 @@ -141,6 +141,8 @@ export const skeleton02 = gray70;
export const background = uiBackground;
export const layer = ui01;
export const layerAccent = ui03;
export const layerAccentActive = gray60;
export const layerAccentHover = adjustLightness(layerAccent, +6);
export const field = field01;
export const backgroundInverse = inverse02;
export const backgroundBrand = interactive01;
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g80.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ import {
export const background = gray80;
export const layer = gray70;
export const layerAccent = gray60;
export const layerAccentActive = gray70;
export const layerAccentHover = adjustLightness(layerAccent, -7);
export const field = gray70;
export const backgroundInverse = gray10;
export const backgroundBrand = blue60;
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g90.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ export const skeleton02 = gray70;
export const background = uiBackground;
export const layer = ui01;
export const layerAccent = ui03;
export const layerAccentActive = gray50;
export const layerAccentHover = adjustLightness(layerAccent, +7);
export const field = field01;
export const backgroundInverse = inverse02;
export const backgroundBrand = interactive01;
Expand Down
4 changes: 4 additions & 0 deletions packages/themes/src/tokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ const colors = [
'background',
'layer',
'layerAccent',
'layerAccentHover',
'layerAccentActive',
'field',
'backgroundInverse',
'backgroundBrand',
Expand Down Expand Up @@ -304,6 +306,8 @@ export const unstable__meta = {
'background',
'layer',
'layerAccent',
'layerAccentHover',
'layerAccentActive',
'field',
'backgroundInverse',
'backgroundBrand',
Expand Down
5 changes: 4 additions & 1 deletion packages/themes/src/v9.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* LICENSE file in the root directory of this source tree.
*/

import { white, red60 } from '@carbon/colors';
import { adjustLightness } from './tools';
import { white, red60, gray40 } from '@carbon/colors';

export const interactive01 = '#3d70b2';
export const interactive02 = '#4d5358';
Expand Down Expand Up @@ -106,6 +107,8 @@ export const skeleton02 = 'rgba(61, 112, 178, .1)';
export const background = uiBackground;
export const layer = ui01;
export const layerAccent = ui03;
export const layerAccentActive = gray40;
export const layerAccentHover = adjustLightness(layerAccent, -6);
export const field = field01;
export const backgroundInverse = inverse02;
export const backgroundBrand = interactive01;
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 @@ -142,6 +142,8 @@ export const skeleton02 = gray30;
export const background = uiBackground;
export const layer = ui01;
export const layerAccent = ui03;
export const layerAccentActive = gray40;
export const layerAccentHover = adjustLightness(layerAccent, -6);
export const field = field01;
export const backgroundInverse = inverse02;
export const backgroundBrand = interactive01;
Expand Down