Merge branch 'dev' into staging
This commit is contained in:
commit
904c6be95a
@ -24,4 +24,8 @@
|
|||||||
&.error {
|
&.error {
|
||||||
background-color: var(--tag-error-background);
|
background-color: var(--tag-error-background);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.neutral {
|
||||||
|
background-color: var(--tag-neutral-background);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,7 @@ export enum ETagColor {
|
|||||||
SUCCESS = "success",
|
SUCCESS = "success",
|
||||||
ERROR = "error",
|
ERROR = "error",
|
||||||
WARNING = "warning",
|
WARNING = "warning",
|
||||||
|
NEUTRAL = "neutral",
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum ETagVariant {
|
export enum ETagVariant {
|
||||||
@ -24,10 +25,11 @@ type IProps = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const colorMap: Record<ETagColor, ETypoColor> = {
|
const colorMap: Record<ETagColor, ETypoColor> = {
|
||||||
[ETagColor.INFO]: ETypoColor.COLOR_INFO_900,
|
[ETagColor.INFO]: ETypoColor.TAG_INFO_CONTRAST,
|
||||||
[ETagColor.SUCCESS]: ETypoColor.COLOR_SUCCESS_700,
|
[ETagColor.SUCCESS]: ETypoColor.TAG_SUCCESS_CONTRAST,
|
||||||
[ETagColor.ERROR]: ETypoColor.COLOR_SECONDARY_700,
|
[ETagColor.ERROR]: ETypoColor.TAG_ERROR_CONTRAST,
|
||||||
[ETagColor.WARNING]: ETypoColor.COLOR_WARNING_700,
|
[ETagColor.WARNING]: ETypoColor.TAG_WARNING_CONTRAST,
|
||||||
|
[ETagColor.NEUTRAL]: ETypoColor.TAG_NEUTRAL_CONTRAST,
|
||||||
};
|
};
|
||||||
|
|
||||||
const typoMap: Record<ETagVariant, ETypo> = {
|
const typoMap: Record<ETagVariant, ETypo> = {
|
||||||
|
@ -163,6 +163,12 @@ export enum ETypoColor {
|
|||||||
DROPDOWN_CONTRAST_ACTIVE = "--dropdown-contrast-active",
|
DROPDOWN_CONTRAST_ACTIVE = "--dropdown-contrast-active",
|
||||||
|
|
||||||
INPUT_CHIP_CONTRAST = "--input-chip-contrast",
|
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) {
|
export default function Typography(props: IProps) {
|
||||||
|
@ -389,6 +389,7 @@ export default function DesignSystem() {
|
|||||||
<Tag color={ETagColor.SUCCESS} variant={ETagVariant.REGULAR} label="Success" />
|
<Tag color={ETagColor.SUCCESS} variant={ETagVariant.REGULAR} label="Success" />
|
||||||
<Tag color={ETagColor.WARNING} variant={ETagVariant.REGULAR} label="Warning" />
|
<Tag color={ETagColor.WARNING} variant={ETagVariant.REGULAR} label="Warning" />
|
||||||
<Tag color={ETagColor.ERROR} variant={ETagVariant.REGULAR} label="Error" />
|
<Tag color={ETagColor.ERROR} variant={ETagVariant.REGULAR} label="Error" />
|
||||||
|
<Tag color={ETagColor.NEUTRAL} variant={ETagVariant.REGULAR} label="Envoyé" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Typography typo={ETypo.TEXT_LG_BOLD}>Table Tags</Typography>
|
<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.SUCCESS} variant={ETagVariant.SEMI_BOLD} label="SUCCESS" />
|
||||||
<Tag color={ETagColor.WARNING} variant={ETagVariant.SEMI_BOLD} label="WARNING" />
|
<Tag color={ETagColor.WARNING} variant={ETagVariant.SEMI_BOLD} label="WARNING" />
|
||||||
<Tag color={ETagColor.ERROR} variant={ETagVariant.SEMI_BOLD} label="ERROR" />
|
<Tag color={ETagColor.ERROR} variant={ETagVariant.SEMI_BOLD} label="ERROR" />
|
||||||
|
<Tag color={ETagColor.NEUTRAL} variant={ETagVariant.SEMI_BOLD} label="ENVOYÉ" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Typography typo={ETypo.TEXT_LG_BOLD}>Table</Typography>
|
<Typography typo={ETypo.TEXT_LG_BOLD}>Table</Typography>
|
||||||
|
@ -520,6 +520,8 @@
|
|||||||
--tabs-contrast-warning: var(--color-warning-500);
|
--tabs-contrast-warning: var(--color-warning-500);
|
||||||
--tag-error-background: var(--error-weak-higlight);
|
--tag-error-background: var(--error-weak-higlight);
|
||||||
--tag-error-contrast: var(--error-weak-contrast);
|
--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-background: var(--info-weak-higlight);
|
||||||
--tag-info-contrast: var(--info-strong-higlight);
|
--tag-info-contrast: var(--info-strong-higlight);
|
||||||
--tag-success-background: var(--success-weak-higlight);
|
--tag-success-background: var(--success-weak-higlight);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user