Skip to content
Closed
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
69 changes: 49 additions & 20 deletions src/skins/blau.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const palette = {
blauBlueSecondary20: '#B2D4EC',
blauBlueSecondary30: '#80B7DF',
blauBlueSecondary60: '#005A99',
blauBlueDark: '#023E76',
blauPurple: '#7814B3',
blauPurple10: '#F1E7F7',
blauPurple30: '#BB89D9',
Expand Down Expand Up @@ -81,32 +82,32 @@ export const getBlauSkin: GetKnownSkin = () => {
buttonLinkDangerBackgroundInverse: palette.white,
buttonLinkDangerBackgroundInversePressed: palette.blauRed10,
buttonLinkBackgroundPressed: palette.blauPurple10,
buttonLinkBackgroundInversePressed: applyAlpha(palette.white, 0.15),
buttonLinkBackgroundInversePressed: applyAlpha(palette.blauBlueDark, 0.15),
buttonPrimaryBackground: palette.blauBlueSecondary,
buttonPrimaryBackgroundInverse: palette.white,
buttonPrimaryBackgroundPressed: palette.blauBlueSecondary60,
buttonPrimaryBackgroundHover: palette.blauBlueSecondary60,
buttonPrimaryBackgroundInversePressed: palette.blauBluePrimary30,
buttonSecondaryBorder: palette.blauBlueSecondary,
buttonSecondaryBorderPressed: palette.blauBlueSecondary60,
buttonSecondaryBorderInverse: palette.white,
buttonSecondaryBorderInverse: palette.blauBlueDark,
buttonSecondaryBackgroundHover: palette.blauBlueSecondary10,
buttonSecondaryBackgroundPressed: palette.blauBlueSecondary10,
buttonSecondaryBorderInversePressed: palette.white,
buttonSecondaryBackgroundInverseHover: applyAlpha(palette.white, 0.2),
buttonSecondaryBackgroundInversePressed: applyAlpha(palette.white, 0.2),
textButtonPrimary: palette.white,
textButtonPrimaryInverse: palette.blauBlueSecondary,
textButtonPrimaryInverse: palette.blauBlueDark,
textButtonPrimaryInversePressed: palette.blauBlueSecondary60,
textButtonSecondary: palette.blauBlueSecondary,
textButtonSecondaryPressed: palette.blauBlueSecondary60,
textButtonSecondaryInverse: palette.white,
textButtonSecondaryInverse: palette.blauBlueDark,
textButtonSecondaryInversePressed: palette.white,
textLink: palette.blauPurple,
textLinkInverse: palette.white,
textLinkInverse: palette.blauBlueDark,
textLinkDanger: palette.blauRed,
textLinkSnackbar: palette.blauPurple30,
textActivated: palette.blauBlueSecondary,
textLinkSnackbar: palette.blauBlueDark,
textActivated: palette.blauBlueDark,
textBrand: palette.blauBluePrimary,
control: palette.grey5,
controlActivated: palette.blauBlueSecondary,
Expand All @@ -124,9 +125,9 @@ export const getBlauSkin: GetKnownSkin = () => {
divider: palette.grey2,
dividerInverse: applyAlpha(palette.white, 0.2),
navigationBarDivider: palette.blauBluePrimary,
badge: palette.blauRed,
feedbackErrorBackground: palette.blauRed,
feedbackInfoBackground: palette.grey6,
badge: palette.blauBluePrimary,
feedbackErrorBackground: palette.blauRed30,
feedbackInfoBackground: palette.blauBluePrimary,
brand: palette.blauBluePrimary,
brandHigh: palette.blauBlueSecondary,
inverse: palette.white,
Expand All @@ -136,9 +137,9 @@ export const getBlauSkin: GetKnownSkin = () => {
neutralLow: palette.grey1,
neutralLowAlternative: palette.grey2,
textPrimary: palette.grey6,
textPrimaryInverse: palette.white,
textPrimaryInverse: palette.blauBlueDark,
textSecondary: palette.grey5,
textSecondaryInverse: palette.blauBluePrimary20,
textSecondaryInverse: palette.blauBlueDark,
error: palette.blauRed,
textError: palette.blauRed,
textErrorInverse: palette.white,
Expand Down Expand Up @@ -374,15 +375,43 @@ export const getBlauSkin: GetKnownSkin = () => {
text2: {lineHeight: {desktop: 24, mobile: 20}, size: {desktop: 16, mobile: 14}},
text3: {lineHeight: {desktop: 24, mobile: 24}, size: {desktop: 18, mobile: 16}},
text4: {lineHeight: {desktop: 28, mobile: 24}, size: {desktop: 20, mobile: 18}},
text5: {lineHeight: {desktop: 32, mobile: 24}, size: {desktop: 28, mobile: 20}, weight: 'light'},
text6: {lineHeight: {desktop: 40, mobile: 32}, size: {desktop: 32, mobile: 24}, weight: 'light'},
text7: {lineHeight: {desktop: 48, mobile: 32}, size: {desktop: 40, mobile: 28}, weight: 'light'},
text8: {lineHeight: {desktop: 56, mobile: 40}, size: {desktop: 48, mobile: 32}, weight: 'light'},
text9: {lineHeight: {desktop: 64, mobile: 48}, size: {desktop: 56, mobile: 40}, weight: 'light'},
text10: {lineHeight: {desktop: 72, mobile: 56}, size: {desktop: 64, mobile: 48}, weight: 'light'},
text5: {
lineHeight: {desktop: 32, mobile: 24},
size: {desktop: 28, mobile: 20},
weight: 'regular',
},
text6: {
lineHeight: {desktop: 40, mobile: 32},
size: {desktop: 32, mobile: 24},
weight: 'regular',
},
text7: {
lineHeight: {desktop: 48, mobile: 32},
size: {desktop: 40, mobile: 28},
weight: 'regular',
},
text8: {
lineHeight: {desktop: 56, mobile: 40},
size: {desktop: 48, mobile: 32},
weight: 'regular',
},
text9: {
lineHeight: {desktop: 64, mobile: 48},
size: {desktop: 56, mobile: 40},
weight: 'regular',
},
text10: {
lineHeight: {desktop: 72, mobile: 56},
size: {desktop: 64, mobile: 48},
weight: 'regular',
},
title1: {weight: 'medium'},
title2: {weight: 'light'},
title3: {lineHeight: {desktop: 32, mobile: 24}, size: {desktop: 28, mobile: 20}, weight: 'light'},
title2: {weight: 'regular'},
title3: {
lineHeight: {desktop: 32, mobile: 24},
size: {desktop: 28, mobile: 20},
weight: 'regular',
},
},
};
return skin;
Expand Down
6 changes: 1 addition & 5 deletions src/stepper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,7 @@ const Stepper = ({
<Text1
as="span"
weight={textPresets.indicator.weight}
color={
isCurrent
? vars.colors.textPrimaryInverse
: vars.colors.textSecondary
}
color={isCurrent ? vars.colors.inverse : vars.colors.textSecondary}
aria-hidden="true"
>
{index + 1}
Expand Down
Loading