Merge branch 'dev' into staging

This commit is contained in:
Maxime Lalo 2024-07-19 11:29:49 +02:00
commit e80e206bc1
3 changed files with 7 additions and 8 deletions

View File

@ -141,6 +141,9 @@ export enum ETypoColor {
COLOR_INFO_800 = "--color-info-800",
COLOR_INFO_900 = "--color-info-900",
COLOR_INFO_950 = "--color-info-950",
TABS_CONTRAST_DEFAULT = "--tabs-contrast-default",
TABS_CONTRAST_ACTIVATED = "--tabs-contrast-actived",
}
export default function Typography(props: IProps) {

View File

@ -3,14 +3,10 @@
font-size: 16px;
letter-spacing: 0.08px;
border-bottom: 1px solid var(--color-neutral-500);
border-bottom: 1px solid var(--tabs-stroke, #d7dce0);
cursor: pointer;
&[data-is-selected="true"] {
border-bottom: 2px solid var(--color-neutral-950, #24282e);
}
&:hover {
border-bottom: 2px solid var(--color-neutral-950, #24282e);
border-bottom: 2px solid var(--tabs-contrast-actived, #24282e);
}
}

View File

@ -25,8 +25,8 @@ export default function HorizontalTabs<T>(props: IProps<T>) {
onMouseLeave={handleMouseLeave}
data-is-selected={props.isSelected}>
<Typography
typo={ETypo.TEXT_MD_SEMIBOLD}
color={isHovered || props.isSelected ? ETypoColor.COLOR_NEUTRAL_950 : ETypoColor.COLOR_NEUTRAL_700}>
typo={!isHovered && !props.isSelected ? ETypo.TEXT_MD_REGULAR : ETypo.TEXT_MD_SEMIBOLD}
color={!isHovered && !props.isSelected ? ETypoColor.TABS_CONTRAST_DEFAULT : ETypoColor.TABS_CONTRAST_ACTIVATED}>
{props.label}
</Typography>
</div>