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.

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

✨💄 Legacy colors override #3518

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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/eds-core-react/.storybook/preview.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import '@equinor/eds-tokens/css/variables-verbose.css'
import '@equinor/eds-tokens/legacy-colors-override.css'
const preview = {
viewMode: 'docs',
parameters: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export type HelperTextProps = {
}

export const helperText: HelperTextProps = {
background: colors.ui.background__light.hex,
background: colors.ui.background__light.rgba,
typography: {
...typography.input.helper,
color: colors.text.static_icons__tertiary.rgba,
Expand Down
32 changes: 16 additions & 16 deletions packages/eds-core-react/src/components/Menu/Menu.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,13 @@ export const Complex: StoryFn<MenuProps> = () => {
<Icon
data={folder}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
<Typography group="navigation" variant="menu_title" as="span">
Open
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
as="span"
Expand All @@ -168,13 +168,13 @@ export const Complex: StoryFn<MenuProps> = () => {
<Icon
data={copy}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
<Typography group="navigation" variant="menu_title" as="span">
Copy
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
as="span"
Expand All @@ -186,13 +186,13 @@ export const Complex: StoryFn<MenuProps> = () => {
<Icon
data={paste}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
<Typography group="navigation" variant="menu_title" as="span">
Paste
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
as="span"
Expand All @@ -204,13 +204,13 @@ export const Complex: StoryFn<MenuProps> = () => {
<Icon
data={edit}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
<Typography group="navigation" variant="menu_title" as="span">
Rename
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
as="span"
Expand All @@ -222,13 +222,13 @@ export const Complex: StoryFn<MenuProps> = () => {
<Icon
data={delete_to_trash}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
<Typography group="navigation" variant="menu_title" as="span">
Delete
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
as="span"
Expand All @@ -241,7 +241,7 @@ export const Complex: StoryFn<MenuProps> = () => {
<Icon
data={settings}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
<Typography group="navigation" variant="menu_title" as="span">
Settings
Expand Down Expand Up @@ -349,7 +349,7 @@ export const StaysOpen: StoryFn<MenuProps> = (args) => {
<Icon
data={error_outlined}
size={24}
color={colors.interactive.danger__resting.hex}
color={colors.interactive.danger__resting.rgba}
/>
</Menu.Item>
<Menu.Item
Expand All @@ -366,7 +366,7 @@ export const StaysOpen: StoryFn<MenuProps> = (args) => {
<Icon
data={warning_outlined}
size={24}
color={colors.interactive.warning__resting.hex}
color={colors.interactive.warning__resting.rgba}
/>
</Menu.Item>
<Menu.Item
Expand All @@ -383,7 +383,7 @@ export const StaysOpen: StoryFn<MenuProps> = (args) => {
<Icon
data={check_circle_outlined}
size={24}
color={colors.interactive.success__resting.hex}
color={colors.interactive.success__resting.rgba}
/>
</Menu.Item>
</Menu.Section>
Expand Down Expand Up @@ -483,7 +483,7 @@ export const AsLink: StoryFn<MenuProps> = () => {
<Icon
data={external_link}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
</Menu.Item>
<Menu.Item
Expand All @@ -499,7 +499,7 @@ export const AsLink: StoryFn<MenuProps> = () => {
<Icon
data={external_link}
size={16}
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
/>
</Menu.Item>
</Menu>
Expand Down
4 changes: 2 additions & 2 deletions packages/eds-core-react/stories/playground/DataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const MenuButton = ({ row }: { row: string[] }) => {
Open
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
style={{ height: 12 }}
Expand All @@ -161,7 +161,7 @@ const MenuButton = ({ row }: { row: string[] }) => {
Copy
</Typography>
<Typography
color={colors.text.static_icons__tertiary.hex}
color={colors.text.static_icons__tertiary.rgba}
group="navigation"
variant="label"
as="span"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function FilterWrapper<T = unknown>({
aria-label={'Show column filters'}
>
<Icon
color={tokens.colors.text.static_icons__default.hex}
color={tokens.colors.text.static_icons__default.rgba}
data={
hasActiveFilters(columnFilterValue) ? filter_alt_active : filter_alt
}
Expand Down
Loading