Compare commits

...
Author SHA1 Message Date
Aleka Cheung 4d6969748c bump localization 2024-02-06 13:58:46 -05:00
moo-onthelawn dbc34599a6 TRCL-3543 Create red/green color tokens and audit (replace) usages of error/success color tokens (#271)
* audited

* fix double header
2024-02-06 13:38:13 -05:00
18 changed files with 52 additions and 38 deletions
+1 -1
View File
@@ -41,7 +41,7 @@
"@cosmjs/tendermint-rpc": "^0.32.1", "@cosmjs/tendermint-rpc": "^0.32.1",
"@dydxprotocol/v4-abacus": "^1.4.2", "@dydxprotocol/v4-abacus": "^1.4.2",
"@dydxprotocol/v4-client-js": "^1.0.20", "@dydxprotocol/v4-client-js": "^1.0.20",
"@dydxprotocol/v4-localization": "^1.1.22", "@dydxprotocol/v4-localization": "^1.1.24",
"@ethersproject/providers": "^5.7.2", "@ethersproject/providers": "^5.7.2",
"@js-joda/core": "^5.5.3", "@js-joda/core": "^5.5.3",
"@radix-ui/react-accordion": "^1.1.2", "@radix-ui/react-accordion": "^1.1.2",
+4 -4
View File
@@ -32,8 +32,8 @@ dependencies:
specifier: ^1.0.20 specifier: ^1.0.20
version: 1.0.20 version: 1.0.20
'@dydxprotocol/v4-localization': '@dydxprotocol/v4-localization':
specifier: ^1.1.22 specifier: ^1.1.24
version: 1.1.22 version: 1.1.24
'@ethersproject/providers': '@ethersproject/providers':
specifier: ^5.7.2 specifier: ^5.7.2
version: 5.7.2 version: 5.7.2
@@ -1121,8 +1121,8 @@ packages:
- utf-8-validate - utf-8-validate
dev: false dev: false
/@dydxprotocol/v4-localization@1.1.22: /@dydxprotocol/v4-localization@1.1.24:
resolution: {integrity: sha512-DURyvBx0qjXmtebSRMW4ZdTsX5xI8Mb6c7LQ8WUPU0O3Jr7n7iUT/phzZszTpwNOMFFMukMFtn7fHCgijw1TOg==} resolution: {integrity: sha512-75XpxxYTpy8eIFcJINyLlvw5J93t0TrS5LacE6J5Raz9LOUWRK4VyRbdLCU2QX8AG7xiTZk1ma8ytylVZOVx3A==}
dev: false dev: false
/@dydxprotocol/v4-proto@4.0.0-dev.0: /@dydxprotocol/v4-proto@4.0.0-dev.0:
-3
View File
@@ -40,9 +40,6 @@ const AlertContainer = styled.div<StyleProps>`
case AlertType.Info: { case AlertType.Info: {
return css` return css`
--alert-accent-color: var(--color-text-1); --alert-accent-color: var(--color-text-1);
--alert-default-background-opacity: 0.133; // Relative
// --alert-background: var(--color-layer-6); // Absolute
`; `;
} }
case AlertType.Success: { case AlertType.Success: {
+3 -3
View File
@@ -103,14 +103,14 @@ const buttonActionVariants = {
[ButtonAction.Create]: css` [ButtonAction.Create]: css`
--button-textColor: var(--color-text-button); --button-textColor: var(--color-text-button);
--button-backgroundColor: var(--color-success); --button-backgroundColor: var(--color-green);
--button-border: solid var(--border-width) var(--color-border-white); --button-border: solid var(--border-width) var(--color-border-white);
--button-hover-filter: brightness(var(--hover-filter-variant)); --button-hover-filter: brightness(var(--hover-filter-variant));
`, `,
[ButtonAction.Destroy]: css` [ButtonAction.Destroy]: css`
--button-textColor: var(--color-text-button); --button-textColor: var(--color-text-button);
--button-backgroundColor: var(--color-error); --button-backgroundColor: var(--color-red);
--button-border: solid var(--border-width) var(--color-border-white); --button-border: solid var(--border-width) var(--color-border-white);
--button-hover-filter: brightness(var(--hover-filter-variant)); --button-hover-filter: brightness(var(--hover-filter-variant));
`, `,
@@ -122,7 +122,7 @@ const buttonActionVariants = {
`, `,
[ButtonAction.Reset]: css` [ButtonAction.Reset]: css`
--button-textColor: var(--color-error); --button-textColor: var(--color-red);
--button-backgroundColor: var(--color-layer-3); --button-backgroundColor: var(--color-layer-3);
--button-border: solid var(--border-width) var(--color-border-red); --button-border: solid var(--border-width) var(--color-border-red);
--button-hover-filter: brightness(var(--hover-filter-variant)); --button-hover-filter: brightness(var(--hover-filter-variant));
+2 -2
View File
@@ -91,10 +91,10 @@ Styled.Item = styled(Item)<{ $highlightColor: 'accent' | 'create' | 'destroy' }>
--item-highlighted-textColor: var(--color-accent); --item-highlighted-textColor: var(--color-accent);
`, `,
['create']: ` ['create']: `
--item-highlighted-textColor: var(--color-success); --item-highlighted-textColor: var(--color-green);
`, `,
['destroy']: ` ['destroy']: `
--item-highlighted-textColor: var(--color-error); --item-highlighted-textColor: var(--color-red);
`, `,
}[$highlightColor])} }[$highlightColor])}
+1 -1
View File
@@ -47,7 +47,7 @@ Styled.Root = styled(Root)`
--switch-thumb-backgroundColor: var(--color-layer-6); --switch-thumb-backgroundColor: var(--color-layer-6);
--switch-active-backgroundColor: var(--color-accent); --switch-active-backgroundColor: var(--color-accent);
--switch-active-thumb-backgroundColor: ${({ theme }) => theme.switchThumbActiveBackground}; --switch-active-thumb-backgroundColor: var(--color-white);
position: relative; position: relative;
width: var(--switch-width); width: var(--switch-width);
+2 -2
View File
@@ -117,7 +117,7 @@ Styled.ConfirmButton = styled(Styled.IconButton)`
--button-backgroundColor: hsla(203, 25%, 19%, 1); --button-backgroundColor: hsla(203, 25%, 19%, 1);
svg { svg {
color: var(--color-success); color: var(--color-green);
} }
`; `;
@@ -125,7 +125,7 @@ Styled.CancelButton = styled(Styled.IconButton)`
--button-backgroundColor: hsla(296, 16%, 18%, 1); --button-backgroundColor: hsla(296, 16%, 18%, 1);
svg { svg {
color: var(--color-error); color: var(--color-red);
width: 0.8em; width: 0.8em;
height: 0.8em; height: 0.8em;
+8 -2
View File
@@ -5,7 +5,8 @@ export type Theme = {
[AppColorMode.RedUp]: ThemeColorBase; [AppColorMode.RedUp]: ThemeColorBase;
}; };
export type ThemeColorBase = LayerColors & export type ThemeColorBase = BaseColors &
LayerColors &
BorderColors & BorderColors &
TextColors & TextColors &
GradientColors & GradientColors &
@@ -17,6 +18,12 @@ export type ThemeColorBase = LayerColors &
ComponentColors & ComponentColors &
Filters; Filters;
type BaseColors = {
white: string;
green: string;
red: string;
};
type LayerColors = { type LayerColors = {
layer0: string; layer0: string;
layer1: string; layer1: string;
@@ -86,7 +93,6 @@ type IconColors = {
type ComponentColors = { type ComponentColors = {
inputBackground: string; inputBackground: string;
popoverBackground: string; popoverBackground: string;
switchThumbActiveBackground: string;
toggleBackground: string; toggleBackground: string;
tooltipBackground: string; tooltipBackground: string;
}; };
+1 -1
View File
@@ -335,7 +335,7 @@ Styled.ActionButton = styled(IconButton)<{ iconName?: IconName }>`
${({ iconName }) => ${({ iconName }) =>
iconName === IconName.Close iconName === IconName.Close
? css` ? css`
--button-textColor: var(--color-error); --button-textColor: var(--color-red);
--button-icon-size: 0.75em; --button-icon-size: 0.75em;
` `
: iconName === IconName.Transfer && : iconName === IconName.Transfer &&
+4
View File
@@ -2,6 +2,10 @@ import { createGlobalStyle } from 'styled-components';
export const GlobalStyle = createGlobalStyle` export const GlobalStyle = createGlobalStyle`
:root { :root {
--color-white: ${({ theme }) => theme.white};
--color-green: ${({ theme }) => theme.green};
--color-red: ${({ theme }) => theme.red};
--color-layer-0: ${({ theme }) => theme.layer0}; --color-layer-0: ${({ theme }) => theme.layer0};
--color-layer-1: ${({ theme }) => theme.layer1}; --color-layer-1: ${({ theme }) => theme.layer1};
--color-layer-2: ${({ theme }) => theme.layer2}; --color-layer-2: ${({ theme }) => theme.layer2};
+12 -3
View File
@@ -4,6 +4,10 @@ import { BrightnessFilterToken, ColorToken, OpacityToken } from '@/constants/sty
import { generateFadedColorVariant } from '@/lib/styles'; import { generateFadedColorVariant } from '@/lib/styles';
const ClassicThemeBase: ThemeColorBase = { const ClassicThemeBase: ThemeColorBase = {
white: ColorToken.White,
green: ColorToken.Green1,
red: ColorToken.Red2,
layer0: ColorToken.GrayBlue7, layer0: ColorToken.GrayBlue7,
layer1: ColorToken.GrayBlue6, layer1: ColorToken.GrayBlue6,
layer2: ColorToken.GrayBlue5, layer2: ColorToken.GrayBlue5,
@@ -51,7 +55,6 @@ const ClassicThemeBase: ThemeColorBase = {
inputBackground: ColorToken.GrayBlue3, inputBackground: ColorToken.GrayBlue3,
popoverBackground: generateFadedColorVariant(ColorToken.GrayBlue4, OpacityToken.Opacity90), popoverBackground: generateFadedColorVariant(ColorToken.GrayBlue4, OpacityToken.Opacity90),
switchThumbActiveBackground: ColorToken.White,
toggleBackground: ColorToken.GrayBlue3, toggleBackground: ColorToken.GrayBlue3,
tooltipBackground: generateFadedColorVariant(ColorToken.GrayBlue3, OpacityToken.Opacity66), tooltipBackground: generateFadedColorVariant(ColorToken.GrayBlue3, OpacityToken.Opacity66),
@@ -61,6 +64,10 @@ const ClassicThemeBase: ThemeColorBase = {
}; };
const DarkThemeBase: ThemeColorBase = { const DarkThemeBase: ThemeColorBase = {
white: ColorToken.White,
green: ColorToken.Green0,
red: ColorToken.Red0,
layer0: ColorToken.Black, layer0: ColorToken.Black,
layer1: ColorToken.DarkGray11, layer1: ColorToken.DarkGray11,
layer2: ColorToken.DarkGray13, layer2: ColorToken.DarkGray13,
@@ -108,7 +115,6 @@ const DarkThemeBase: ThemeColorBase = {
inputBackground: ColorToken.DarkGray6, inputBackground: ColorToken.DarkGray6,
popoverBackground: generateFadedColorVariant(ColorToken.DarkGray8, OpacityToken.Opacity90), popoverBackground: generateFadedColorVariant(ColorToken.DarkGray8, OpacityToken.Opacity90),
switchThumbActiveBackground: ColorToken.White,
toggleBackground: ColorToken.DarkGray6, toggleBackground: ColorToken.DarkGray6,
tooltipBackground: generateFadedColorVariant(ColorToken.DarkGray6, OpacityToken.Opacity66), tooltipBackground: generateFadedColorVariant(ColorToken.DarkGray6, OpacityToken.Opacity66),
@@ -118,6 +124,10 @@ const DarkThemeBase: ThemeColorBase = {
}; };
const LightThemeBase: ThemeColorBase = { const LightThemeBase: ThemeColorBase = {
white: ColorToken.White,
green: ColorToken.Green2,
red: ColorToken.Red1,
layer0: ColorToken.White, layer0: ColorToken.White,
layer1: ColorToken.LightGray6, layer1: ColorToken.LightGray6,
layer2: ColorToken.White, layer2: ColorToken.White,
@@ -165,7 +175,6 @@ const LightThemeBase: ThemeColorBase = {
inputBackground: ColorToken.White, inputBackground: ColorToken.White,
popoverBackground: generateFadedColorVariant(ColorToken.LightGray8, OpacityToken.Opacity90), popoverBackground: generateFadedColorVariant(ColorToken.LightGray8, OpacityToken.Opacity90),
switchThumbActiveBackground: ColorToken.White,
toggleBackground: ColorToken.LightGray4, toggleBackground: ColorToken.LightGray4,
tooltipBackground: generateFadedColorVariant(ColorToken.LightGray7, OpacityToken.Opacity66), tooltipBackground: generateFadedColorVariant(ColorToken.LightGray7, OpacityToken.Opacity66),
@@ -173,7 +173,7 @@ export const AccountInfoConnectedState = () => {
<WithTooltip tooltip={tooltip} stringParams={stringParams}> <WithTooltip tooltip={tooltip} stringParams={stringParams}>
<Styled.WithUsage> <Styled.WithUsage>
{label} {label}
{hasError ? <Styled.Icon iconName={IconName.CautionCircle} /> : slotRight} {hasError ? <Styled.CautionIcon iconName={IconName.CautionCircle} /> : slotRight}
</Styled.WithUsage> </Styled.WithUsage>
</WithTooltip> </WithTooltip>
), ),
@@ -230,7 +230,7 @@ Styled.CircleContainer = styled.div`
border-radius: 50%; border-radius: 50%;
`; `;
Styled.Icon = styled(Icon)` Styled.CautionIcon = styled(Icon)`
color: var(--color-error); color: var(--color-error);
`; `;
+3 -3
View File
@@ -557,11 +557,11 @@ Styled.PositionTile = styled(PositionTile)``;
Styled.ClosePositionButton = styled(Button)` Styled.ClosePositionButton = styled(Button)`
--button-border: solid var(--border-width) var(--color-border-red); --button-border: solid var(--border-width) var(--color-border-red);
--button-textColor: var(--color-error); --button-textColor: var(--color-red);
`; `;
Styled.ClosePositionToggleButton = styled(ToggleButton)` Styled.ClosePositionToggleButton = styled(ToggleButton)`
--button-border: solid var(--border-width) var(--color-border-red); --button-border: solid var(--border-width) var(--color-border-red);
--button-toggle-off-textColor: var(--color-error); --button-toggle-off-textColor: var(--color-red);
--button-toggle-on-textColor: var(--color-error); --button-toggle-on-textColor: var(--color-red);
`; `;
+2 -3
View File
@@ -39,7 +39,6 @@ export const DisplaySettingsDialog = ({ setIsOpen }: ElementProps) => {
const sectionHeader = (heading: string) => { const sectionHeader = (heading: string) => {
return ( return (
<Styled.Header> <Styled.Header>
{heading}
{heading} {heading}
<HorizontalSeparatorFiller /> <HorizontalSeparatorFiller />
</Styled.Header> </Styled.Header>
@@ -287,10 +286,10 @@ Styled.ArrowIcon = styled(Icon)<{ direction: 'up' | 'down'; color: 'green' | 're
${({ color }) => ${({ color }) =>
({ ({
['green']: css` ['green']: css`
color: var(--color-success); color: var(--color-green);
`, `,
['red']: css` ['red']: css`
color: var(--color-error); color: var(--color-red);
`, `,
}[color])} }[color])}
`; `;
+1 -2
View File
@@ -155,8 +155,7 @@ Styled.CautionIconContainer = styled.div`
content: ''; content: '';
width: 2.5rem; width: 2.5rem;
height: 2.5rem; height: 2.5rem;
background-color: var(--color-error); background-color: var(--color-gradient-error);
opacity: 0.1;
} }
`; `;
@@ -323,7 +323,7 @@ Styled.ReceiptArea = styled.div`
`; `;
Styled.Green = styled.span` Styled.Green = styled.span`
color: var(--color-success); color: var(--color-green);
`; `;
Styled.GreenCheckCircle = styled(GreenCheckCircle)` Styled.GreenCheckCircle = styled(GreenCheckCircle)`
+4 -4
View File
@@ -306,7 +306,7 @@ export const TransferForm = ({
label={ label={
<Styled.DestinationInputLabel> <Styled.DestinationInputLabel>
{stringGetter({ key: STRING_KEYS.DESTINATION })} {stringGetter({ key: STRING_KEYS.DESTINATION })}
{isAddressValid && <Icon iconName={IconName.Check} />} {isAddressValid && <Styled.CheckIcon iconName={IconName.Check} />}
</Styled.DestinationInputLabel> </Styled.DestinationInputLabel>
} }
type={InputType.Text} type={InputType.Text}
@@ -439,10 +439,10 @@ Styled.InlineRow = styled.span`
Styled.DestinationInputLabel = styled.span` Styled.DestinationInputLabel = styled.span`
${layoutMixins.inlineRow} ${layoutMixins.inlineRow}
`;
svg { Styled.CheckIcon = styled(Icon)`
color: var(--color-success); color: var(--color-success);
}
`; `;
Styled.AddressValidationAlertMessage = styled(AlertMessage)` Styled.AddressValidationAlertMessage = styled(AlertMessage)`
@@ -82,6 +82,6 @@ Styled.ActionButton = styled(IconButton)`
Styled.CancelButton = styled(Styled.ActionButton)` Styled.CancelButton = styled(Styled.ActionButton)`
&:not(:disabled) { &:not(:disabled) {
--button-textColor: var(--color-error); --button-textColor: var(--color-red);
} }
`; `;