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

fix(fuselage): Correct tokens usage #940

Merged
merged 12 commits into from
Dec 22, 2022
Merged

fix(fuselage): Correct tokens usage #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
36152ad
Add primitive token N250. Update stroke-extra-light
juliajforesti Nov 29, 2022
962e611
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.F…
juliajforesti Nov 30, 2022
5f77b81
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.F…
juliajforesti Nov 30, 2022
563daf6
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.F…
juliajforesti Dec 1, 2022
2d92476
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.F…
juliajforesti Dec 5, 2022
e1f91a4
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.F…
juliajforesti Dec 12, 2022
b1b6721
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.F…
juliajforesti Dec 14, 2022
20b41a7
update Field.styles row color
juliajforesti Dec 15, 2022
f111cf6
Update ProgressBar colors
juliajforesti Dec 15, 2022
ccc622e
update icon disabled color
juliajforesti Dec 15, 2022
8ef6d67
fix Callout font colors
juliajforesti Dec 19, 2022
1b961af
improve Callout stories
juliajforesti Dec 19, 2022
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: 1 addition & 1 deletion packages/fuselage/src/components/Callout/Callout.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ Danger.parameters = setStoryDescription(

export const CustomIcon = Template.bind({});
CustomIcon.args = {
title: 'This is a danger message',
title: 'This is a message with custom icon',
icon: 'hash',
};
8 changes: 4 additions & 4 deletions packages/fuselage/src/components/Callout/Callout.styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,31 @@
background-color: theme('callout-background-color', colors.surface(tint));

&--type-info {
color: theme('callout-color-info', colors.status-font(on-info));
color: theme('callout-color-info', colors.font(pure-black));
background-color: theme(
'callout-background-color-info',
colors.status-background(info)
);
}

&--type-success {
color: theme('callout-color-success', colors.status-font(on-success));
color: theme('callout-color-success', colors.font(pure-black));
background-color: theme(
'callout-background-color-success',
colors.status-background(success)
);
}

&--type-warning {
color: theme('callout-color-warning', colors.status-font(on-warning));
color: theme('callout-color-warning', colors.font(pure-black));
background-color: theme(
'callout-background-color-warning',
colors.status-background(warning)
);
}

&--type-danger {
color: theme('callout-color-danger', colors.status-font(on-danger));
color: theme('callout-color-danger', colors.font(pure-black));
background-color: theme(
'callout-background-color-danger',
colors.status-background(danger)
Expand Down
2 changes: 2 additions & 0 deletions packages/fuselage/src/components/Field/Field.styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
margin-block-start: lengths.margin(4);
margin-block-end: lengths.margin(2);

color: colors.font(secondary-info);

& .rcx-field__label {
padding-inline-start: lengths.padding(8);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage/src/components/ProgressBar/ProgressBar.styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $progress-bar-color-shine: theme(
);
$progress-bar-color-background: theme(
'progress-bar-color-background',
colors.neutral(400, 1)
colors.surface(neutral)
);

$progress-bar-border-radius: theme(
Expand Down
6 changes: 3 additions & 3 deletions packages/fuselage/src/components/ProgressBar/ProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ const getWidth = (percentage: number): string =>

const getColor = (percentage: number, error?: string) => {
if (error) {
return 'danger-200';
return 'status-font-on-danger';
}

if (percentage >= 100) {
return 'success-200';
return 'status-font-on-success';
}

return 'primary-200';
return 'status-font-on-info';
};

type ProgressBarProps = ComponentProps<typeof Box> & {
Expand Down
10 changes: 5 additions & 5 deletions packages/fuselage/src/styles/variables/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ $icon: (
focus-shadow-color: -color('icon', 'focus-shadow-color', map.get($secondary, focus-shadow-color)),
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
disabled-color: -color('icon', 'disabled-color', map.get($secondary, disabled-background-color)),
disabled-color: -color('icon', 'disabled-color', map.get($secondary, disabled-color)),
);

$icon-info: (
Expand All @@ -184,7 +184,7 @@ $icon-info: (
focus-shadow-color: -color('icon-info', 'focus-shadow-color', map.get($secondary, focus-shadow-color)),
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
disabled-color: -color('icon-info', 'disabled-color', map.get($primary, disabled-background-color)),
disabled-color: -color('icon-info', 'disabled-color', map.get($secondary, disabled-color)),
);

$icon-success: (
Expand All @@ -200,7 +200,7 @@ $icon-success: (
focus-shadow-color: -color('icon-success', 'focus-shadow-color', map.get($secondary, focus-shadow-color)),
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
disabled-color: -color('icon-success', 'disabled-color', map.get($success, disabled-background-color)),
disabled-color: -color('icon-success', 'disabled-color', map.get($secondary, disabled-color)),
);

$icon-warning: (
Expand All @@ -216,7 +216,7 @@ $icon-warning: (
focus-shadow-color: -color('icon-warning', 'focus-shadow-color', map.get($secondary, focus-shadow-color)),
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
disabled-color: -color('icon-warning', 'disabled-color', map.get($warning, disabled-background-color)),
disabled-color: -color('icon-warning', 'disabled-color', map.get($secondary, disabled-color)),
);

$icon-danger: (
Expand All @@ -232,5 +232,5 @@ $icon-danger: (
focus-shadow-color: -color('icon-danger', 'focus-shadow-color', map.get($secondary, focus-shadow-color)),
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
disabled-color: -color('icon-danger', 'disabled-color', map.get($danger, disabled-background-color)),
disabled-color: -color('icon-danger', 'disabled-color', map.get($secondary, disabled-color)),
);