Merge branch 'dev' into staging

This commit is contained in:
Max S 2024-08-08 18:02:07 +02:00
commit 904c6be95a
5 changed files with 20 additions and 4 deletions

View File

@ -24,4 +24,8 @@
&.error {
background-color: var(--tag-error-background);
}
&.neutral {
background-color: var(--tag-neutral-background);
}
}

View File

@ -9,6 +9,7 @@ export enum ETagColor {
SUCCESS = "success",
ERROR = "error",
WARNING = "warning",
NEUTRAL = "neutral",
}
export enum ETagVariant {
@ -24,10 +25,11 @@ type IProps = {
};
const colorMap: Record<ETagColor, ETypoColor> = {
[ETagColor.INFO]: ETypoColor.COLOR_INFO_900,
[ETagColor.SUCCESS]: ETypoColor.COLOR_SUCCESS_700,
[ETagColor.ERROR]: ETypoColor.COLOR_SECONDARY_700,
[ETagColor.WARNING]: ETypoColor.COLOR_WARNING_700,
[ETagColor.INFO]: ETypoColor.TAG_INFO_CONTRAST,
[ETagColor.SUCCESS]: ETypoColor.TAG_SUCCESS_CONTRAST,
[ETagColor.ERROR]: ETypoColor.TAG_ERROR_CONTRAST,
[ETagColor.WARNING]: ETypoColor.TAG_WARNING_CONTRAST,
[ETagColor.NEUTRAL]: ETypoColor.TAG_NEUTRAL_CONTRAST,
};
const typoMap: Record<ETagVariant, ETypo> = {

View File

@ -163,6 +163,12 @@ export enum ETypoColor {
DROPDOWN_CONTRAST_ACTIVE = "--dropdown-contrast-active",
INPUT_CHIP_CONTRAST = "--input-chip-contrast",
TAG_NEUTRAL_CONTRAST = "--tag-neutral-contrast",
TAG_INFO_CONTRAST = "--tag-info-contrast",
TAG_SUCCESS_CONTRAST = "--tag-success-contrast",
TAG_WARNING_CONTRAST = "--tag-warning-contrast",
TAG_ERROR_CONTRAST = "--tag-error-contrast",
}
export default function Typography(props: IProps) {

View File

@ -389,6 +389,7 @@ export default function DesignSystem() {
<Tag color={ETagColor.SUCCESS} variant={ETagVariant.REGULAR} label="Success" />
<Tag color={ETagColor.WARNING} variant={ETagVariant.REGULAR} label="Warning" />
<Tag color={ETagColor.ERROR} variant={ETagVariant.REGULAR} label="Error" />
<Tag color={ETagColor.NEUTRAL} variant={ETagVariant.REGULAR} label="Envoyé" />
</div>
<Typography typo={ETypo.TEXT_LG_BOLD}>Table Tags</Typography>
@ -397,6 +398,7 @@ export default function DesignSystem() {
<Tag color={ETagColor.SUCCESS} variant={ETagVariant.SEMI_BOLD} label="SUCCESS" />
<Tag color={ETagColor.WARNING} variant={ETagVariant.SEMI_BOLD} label="WARNING" />
<Tag color={ETagColor.ERROR} variant={ETagVariant.SEMI_BOLD} label="ERROR" />
<Tag color={ETagColor.NEUTRAL} variant={ETagVariant.SEMI_BOLD} label="ENVOYÉ" />
</div>
<Typography typo={ETypo.TEXT_LG_BOLD}>Table</Typography>

View File

@ -520,6 +520,8 @@
--tabs-contrast-warning: var(--color-warning-500);
--tag-error-background: var(--error-weak-higlight);
--tag-error-contrast: var(--error-weak-contrast);
--tag-neutral-background: var(--neutral-weak-higlight);
--tag-neutral-contrast: var(--neutral-weak-contrast);
--tag-info-background: var(--info-weak-higlight);
--tag-info-contrast: var(--info-strong-higlight);
--tag-success-background: var(--success-weak-higlight);