Skip to content

Commit

Permalink
feat(ui-library): resolving merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidken91
davidken91 committed Sep 1, 2023
2 parents d586977 + 8c23e48 commit 298a2e5
Show file tree
Hide file tree
Showing 52 changed files with 3,199 additions and 787 deletions.
4 changes: 3 additions & 1 deletion packages/figma-design-tokens/config/generate-index-files.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,7 @@ themes.array.map((theme) => {
fs.writeFileSync(`../ui-library/src/foundation/_tokens-generated/index.${theme}.generated.ts`, fileOutPut, 'utf-8');
});

const themeFile = `export const Themes = [ "${ themes.array.join('", "') }" ] as const; export type ThemeType = (typeof Themes)[number];`;
const themeFile = `export const Themes = [ "${themes.array.join(
'", "'
)}" ] as const; export type ThemeType = (typeof Themes)[number];`;
fs.writeFileSync(`../ui-library/src/foundation/_tokens-generated/index.themes.ts`, themeFile, 'utf-8');
1 change: 1 addition & 0 deletions packages/figma-design-tokens/config/style-dictionary.config.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const componentTypes = [
'Select',
'Divider',
'StepperCombo',
'Slider',
];

StyleDictionaryPackage.registerFormat({
Expand Down
4 changes: 2 additions & 2 deletions packages/figma-design-tokens/input/tokens/$metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"intermediary/Dark",
"color/SEM",
"color/CMP",
"dimensions/CMP",
"dimensions/SEM"
"dimensions/SEM",
"dimensions/CMP"
]
}
1,110 changes: 657 additions & 453 deletions packages/figma-design-tokens/input/tokens/$themes.json
View file

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions packages/figma-design-tokens/input/tokens/color/CMP.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1110,5 +1110,22 @@
}
}
}
},
"Action": {
"Menu": {
"Surface": {
"Color": {
"value": "{q.background.level_2}",
"type": "color"
}
},
"MenuSection": {
"SectionTitle": {
"value": "{q.content.ondefault.alpha}",
"type": "color",
"description": "Apply on section title"
}
}
}
}
}
216 changes: 216 additions & 0 deletions packages/figma-design-tokens/input/tokens/color/SEM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,212 @@
"type": "color"
}
}
},
"Selectable": {
"UnSelected": {
"SurfaceFill": {
"Rest": {
"value": "{Action.Silent.SurfaceFill.Rest}",
"type": "color"
},
"Hover": {
"value": "{Action.Silent.SurfaceFill.Hover}",
"type": "color"
},
"Pressed": {
"value": "{Action.Silent.SurfaceFill.Pressed}",
"type": "color"
},
"Focus": {
"value": "{Action.Silent.SurfaceFill.Focus}",
"type": "color"
},
"Disabled": {
"value": "{Action.Silent.SurfaceFill.Disabled}",
"type": "color"
}
},
"SurfaceStroke": {
"Rest": {
"value": "{Action.Silent.SurfaceStroke.Rest}",
"type": "color"
},
"Hover": {
"value": "{Action.Silent.SurfaceStroke.Hover}",
"type": "color"
},
"Pressed": {
"value": "{Action.Silent.SurfaceStroke.Pressed}",
"type": "color"
},
"Focus": {
"value": "{Action.Silent.SurfaceStroke.Focus}",
"type": "color"
},
"Disabled": {
"value": "{Action.Silent.SurfaceStroke.Disabled}",
"type": "color"
}
},
"Label": {
"Rest": {
"value": "{q.content.ondefault.alpha}",
"type": "color"
},
"Hover": {
"value": "{q.content.ondefault.alpha}",
"type": "color"
},
"Pressed": {
"value": "{q.content.ondefault.alpha}",
"type": "color"
},
"Focus": {
"value": "{q.content.ondefault.alpha}",
"type": "color"
},
"Disabled": {
"value": "{q.content.ondisabled.alpha}",
"type": "color"
}
},
"DescriptionText": {
"Rest": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Hover": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Pressed": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Focus": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Disabled": {
"value": "{q.content.ondisabled.alpha}",
"type": "color"
}
},
"Icon": {
"Rest": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Hover": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Pressed": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Focus": {
"value": "{q.content.ondefault.beta}",
"type": "color"
},
"Disabled": {
"value": "{q.content.ondisabled.alpha}",
"type": "color"
}
}
},
"Selected": {
"SurfaceFill": {
"Rest": {
"value": "{Action.Primary.SurfaceFill.Rest}",
"type": "color"
},
"Hover": {
"value": "{Action.Primary.SurfaceFill.Hover}",
"type": "color"
},
"Pressed": {
"value": "{Action.Primary.SurfaceFill.Pressed}",
"type": "color"
},
"Focus": {
"value": "{Action.Primary.SurfaceFill.Focus}",
"type": "color"
}
},
"SurfaceStroke": {
"Rest": {
"value": "{Action.Primary.SurfaceStroke.Rest}",
"type": "color"
},
"Hover": {
"value": "{Action.Primary.SurfaceStroke.Hover}",
"type": "color"
},
"Pressed": {
"value": "{Action.Primary.SurfaceStroke.Pressed}",
"type": "color"
},
"Focus": {
"value": "{Action.Primary.SurfaceStroke.Focus}",
"type": "color"
}
},
"Label": {
"Rest": {
"value": "{q.content.onbrand.alpha}",
"type": "color"
},
"Hover": {
"value": "{q.content.onbrand.alpha}",
"type": "color"
},
"Pressed": {
"value": "{q.content.onbrand.alpha}",
"type": "color"
},
"Focus": {
"value": "{q.content.onbrand.alpha}",
"type": "color"
}
},
"DescriptionText": {
"Rest": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
},
"Hover": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
},
"Pressed": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
},
"Focus": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
}
},
"Icon": {
"Rest": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
},
"Hover": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
},
"Pressed": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
},
"Focus": {
"value": "{q.content.onbrand.gamma}",
"type": "color"
}
}
}
}
},
"Forms": {
Expand Down Expand Up @@ -1096,6 +1302,16 @@
"value": "{q.content.ondefault.alpha}",
"type": "color"
}
},
"Background": {
"Level_1": {
"value": "{q.background.level_1}",
"type": "color"
},
"Level_2": {
"value": "{q.background.level_1}",
"type": "color"
}
}
}
}
Loading

0 comments on commit 298a2e5

Please sign in to comment.