Commit d5e4e21a authored by Daniel James's avatar Daniel James Committed by GitHub

style: Adds "deprecated_" prefix to all non-theme colors (#4146)

* Add deprecated_ label to white and black

* Add deprecated_ label to text1 through text5

* Add deprecated_ label for bg0 through bg6

* Add deprecated_ prefix to remaining colors

* Add deprecated_ prefix to direct style references

* Add deprecated_ prefix to all remaining colors

* Update link color

* Fix 'deprecated_white' -> theme.deprecated_white

* Update snapshots
parent 46490518
...@@ -6,7 +6,7 @@ import styled from 'styled-components/macro' ...@@ -6,7 +6,7 @@ import styled from 'styled-components/macro'
import { LinkStyledButton } from 'theme' import { LinkStyledButton } from 'theme'
const CopyIcon = styled(LinkStyledButton)` const CopyIcon = styled(LinkStyledButton)`
color: ${({ color, theme }) => color || theme.text3}; color: ${({ color, theme }) => color || theme.deprecated_text3};
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
text-decoration: none; text-decoration: none;
...@@ -14,7 +14,7 @@ const CopyIcon = styled(LinkStyledButton)` ...@@ -14,7 +14,7 @@ const CopyIcon = styled(LinkStyledButton)`
:active, :active,
:focus { :focus {
text-decoration: none; text-decoration: none;
color: ${({ color, theme }) => color || theme.text2}; color: ${({ color, theme }) => color || theme.deprecated_text2};
} }
` `
const StyledText = styled.span` const StyledText = styled.span`
......
...@@ -27,11 +27,12 @@ const TransactionState = styled(ExternalLink)<{ pending: boolean; success?: bool ...@@ -27,11 +27,12 @@ const TransactionState = styled(ExternalLink)<{ pending: boolean; success?: bool
padding: 0.25rem 0rem; padding: 0.25rem 0rem;
font-weight: 500; font-weight: 500;
font-size: 0.825rem; font-size: 0.825rem;
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
` `
const IconWrapper = styled.div<{ pending: boolean; success?: boolean }>` const IconWrapper = styled.div<{ pending: boolean; success?: boolean }>`
color: ${({ pending, success, theme }) => (pending ? theme.primary1 : success ? theme.green1 : theme.red1)}; color: ${({ pending, success, theme }) =>
pending ? theme.deprecated_primary1 : success ? theme.deprecated_green1 : theme.deprecated_red1};
` `
export default function Transaction({ hash }: { hash: string }) { export default function Transaction({ hash }: { hash: string }) {
......
...@@ -24,7 +24,7 @@ const HeaderRow = styled.div` ...@@ -24,7 +24,7 @@ const HeaderRow = styled.div`
${({ theme }) => theme.flexRowNoWrap}; ${({ theme }) => theme.flexRowNoWrap};
padding: 1rem 1rem; padding: 1rem 1rem;
font-weight: 500; font-weight: 500;
color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.primary1 : 'inherit')}; color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.deprecated_primary1 : 'inherit')};
${({ theme }) => theme.mediaWidth.upToMedium` ${({ theme }) => theme.mediaWidth.upToMedium`
padding: 1rem; padding: 1rem;
`}; `};
...@@ -52,7 +52,7 @@ const UpperSection = styled.div` ...@@ -52,7 +52,7 @@ const UpperSection = styled.div`
const InfoCard = styled.div` const InfoCard = styled.div`
padding: 1rem; padding: 1rem;
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
border-radius: 20px; border-radius: 20px;
position: relative; position: relative;
display: grid; display: grid;
...@@ -65,7 +65,7 @@ const AccountGroupingRow = styled.div` ...@@ -65,7 +65,7 @@ const AccountGroupingRow = styled.div`
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-weight: 400; font-weight: 400;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
div { div {
${({ theme }) => theme.flexRowNoWrap} ${({ theme }) => theme.flexRowNoWrap}
...@@ -95,14 +95,14 @@ const LowerSection = styled.div` ...@@ -95,14 +95,14 @@ const LowerSection = styled.div`
padding: 1.5rem; padding: 1.5rem;
flex-grow: 1; flex-grow: 1;
overflow: auto; overflow: auto;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
h5 { h5 {
margin: 0; margin: 0;
font-weight: 400; font-weight: 400;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
} }
` `
...@@ -130,12 +130,12 @@ const AccountControl = styled.div` ...@@ -130,12 +130,12 @@ const AccountControl = styled.div`
const AddressLink = styled(ExternalLink)<{ hasENS: boolean; isENS: boolean }>` const AddressLink = styled(ExternalLink)<{ hasENS: boolean; isENS: boolean }>`
font-size: 0.825rem; font-size: 0.825rem;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
margin-left: 1rem; margin-left: 1rem;
font-size: 0.825rem; font-size: 0.825rem;
display: flex; display: flex;
:hover { :hover {
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
} }
` `
...@@ -151,7 +151,7 @@ const CloseIcon = styled.div` ...@@ -151,7 +151,7 @@ const CloseIcon = styled.div`
const CloseColor = styled(Close)` const CloseColor = styled(Close)`
path { path {
stroke: ${({ theme }) => theme.text4}; stroke: ${({ theme }) => theme.deprecated_text4};
} }
` `
...@@ -159,7 +159,7 @@ const WalletName = styled.div` ...@@ -159,7 +159,7 @@ const WalletName = styled.div`
width: initial; width: initial;
font-size: 0.825rem; font-size: 0.825rem;
font-weight: 500; font-weight: 500;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
` `
const TransactionListWrapper = styled.div` const TransactionListWrapper = styled.div`
...@@ -351,7 +351,7 @@ export default function AccountDetails({ ...@@ -351,7 +351,7 @@ export default function AccountDetails({
</LowerSection> </LowerSection>
) : ( ) : (
<LowerSection> <LowerSection>
<ThemedText.Body color={theme.text1}> <ThemedText.Body color={theme.deprecated_text1}>
<Trans>Your transactions will appear here...</Trans> <Trans>Your transactions will appear here...</Trans>
</ThemedText.Body> </ThemedText.Body>
</LowerSection> </LowerSection>
......
...@@ -15,7 +15,7 @@ const InputPanel = styled.div` ...@@ -15,7 +15,7 @@ const InputPanel = styled.div`
${({ theme }) => theme.flexColumnNoWrap} ${({ theme }) => theme.flexColumnNoWrap}
position: relative; position: relative;
border-radius: 1.25rem; border-radius: 1.25rem;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
z-index: 1; z-index: 1;
width: 100%; width: 100%;
` `
...@@ -25,10 +25,10 @@ const ContainerRow = styled.div<{ error: boolean }>` ...@@ -25,10 +25,10 @@ const ContainerRow = styled.div<{ error: boolean }>`
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 1.25rem; border-radius: 1.25rem;
border: 1px solid ${({ error, theme }) => (error ? theme.red1 : theme.bg2)}; border: 1px solid ${({ error, theme }) => (error ? theme.deprecated_red1 : theme.deprecated_bg2)};
transition: border-color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')}, transition: border-color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')},
color 500ms ${({ error }) => (error ? 'step-end' : 'step-start')}; color 500ms ${({ error }) => (error ? 'step-end' : 'step-start')};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
` `
const InputContainer = styled.div` const InputContainer = styled.div`
...@@ -42,15 +42,15 @@ const Input = styled.input<{ error?: boolean }>` ...@@ -42,15 +42,15 @@ const Input = styled.input<{ error?: boolean }>`
border: none; border: none;
flex: 1 1 auto; flex: 1 1 auto;
width: 0; width: 0;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
transition: color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')}; transition: color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')};
color: ${({ error, theme }) => (error ? theme.red1 : theme.text1)}; color: ${({ error, theme }) => (error ? theme.deprecated_red1 : theme.deprecated_text1)};
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: 500; font-weight: 500;
width: 100%; width: 100%;
::placeholder { ::placeholder {
color: ${({ theme }) => theme.text4}; color: ${({ theme }) => theme.deprecated_text4};
} }
padding: 0px; padding: 0px;
-webkit-appearance: textfield; -webkit-appearance: textfield;
...@@ -65,7 +65,7 @@ const Input = styled.input<{ error?: boolean }>` ...@@ -65,7 +65,7 @@ const Input = styled.input<{ error?: boolean }>`
} }
::placeholder { ::placeholder {
color: ${({ theme }) => theme.text4}; color: ${({ theme }) => theme.deprecated_text4};
} }
` `
...@@ -108,7 +108,7 @@ export default function AddressInputPanel({ ...@@ -108,7 +108,7 @@ export default function AddressInputPanel({
<InputContainer> <InputContainer>
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<ThemedText.Black color={theme.text2} fontWeight={500} fontSize={14}> <ThemedText.Black color={theme.deprecated_text2} fontWeight={500} fontSize={14}>
{label ?? <Trans>Recipient</Trans>} {label ?? <Trans>Recipient</Trans>}
</ThemedText.Black> </ThemedText.Black>
{address && chainId && ( {address && chainId && (
......
...@@ -17,7 +17,7 @@ const BadgeText = styled.div` ...@@ -17,7 +17,7 @@ const BadgeText = styled.div`
` `
const ActiveDot = styled.span` const ActiveDot = styled.span`
background-color: ${({ theme }) => theme.success}; background-color: ${({ theme }) => theme.deprecated_success};
border-radius: 50%; border-radius: 50%;
height: 8px; height: 8px;
width: 8px; width: 8px;
......
...@@ -20,24 +20,24 @@ interface BadgeProps { ...@@ -20,24 +20,24 @@ interface BadgeProps {
function pickBackgroundColor(variant: BadgeVariant | undefined, theme: DefaultTheme): Color { function pickBackgroundColor(variant: BadgeVariant | undefined, theme: DefaultTheme): Color {
switch (variant) { switch (variant) {
case BadgeVariant.NEGATIVE: case BadgeVariant.NEGATIVE:
return theme.error return theme.deprecated_error
case BadgeVariant.POSITIVE: case BadgeVariant.POSITIVE:
return theme.success return theme.deprecated_success
case BadgeVariant.PRIMARY: case BadgeVariant.PRIMARY:
return theme.primary1 return theme.deprecated_primary1
case BadgeVariant.WARNING: case BadgeVariant.WARNING:
return theme.warning return theme.deprecated_warning
case BadgeVariant.WARNING_OUTLINE: case BadgeVariant.WARNING_OUTLINE:
return 'transparent' return 'transparent'
default: default:
return theme.bg2 return theme.deprecated_bg2
} }
} }
function pickBorder(variant: BadgeVariant | undefined, theme: DefaultTheme): string { function pickBorder(variant: BadgeVariant | undefined, theme: DefaultTheme): string {
switch (variant) { switch (variant) {
case BadgeVariant.WARNING_OUTLINE: case BadgeVariant.WARNING_OUTLINE:
return `1px solid ${theme.warning}` return `1px solid ${theme.deprecated_warning}`
default: default:
return 'unset' return 'unset'
} }
...@@ -46,15 +46,15 @@ function pickBorder(variant: BadgeVariant | undefined, theme: DefaultTheme): str ...@@ -46,15 +46,15 @@ function pickBorder(variant: BadgeVariant | undefined, theme: DefaultTheme): str
function pickFontColor(variant: BadgeVariant | undefined, theme: DefaultTheme): string { function pickFontColor(variant: BadgeVariant | undefined, theme: DefaultTheme): string {
switch (variant) { switch (variant) {
case BadgeVariant.NEGATIVE: case BadgeVariant.NEGATIVE:
return readableColor(theme.error) return readableColor(theme.deprecated_error)
case BadgeVariant.POSITIVE: case BadgeVariant.POSITIVE:
return readableColor(theme.success) return readableColor(theme.deprecated_success)
case BadgeVariant.WARNING: case BadgeVariant.WARNING:
return readableColor(theme.warning) return readableColor(theme.deprecated_warning)
case BadgeVariant.WARNING_OUTLINE: case BadgeVariant.WARNING_OUTLINE:
return theme.warning return theme.deprecated_warning
default: default:
return readableColor(theme.bg2) return readableColor(theme.deprecated_bg2)
} }
} }
......
...@@ -23,7 +23,7 @@ export const BaseButton = styled(RebassButton)< ...@@ -23,7 +23,7 @@ export const BaseButton = styled(RebassButton)<
border-radius: ${({ $borderRadius }) => $borderRadius ?? '20px'}; border-radius: ${({ $borderRadius }) => $borderRadius ?? '20px'};
outline: none; outline: none;
border: 1px solid transparent; border: 1px solid transparent;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
text-decoration: none; text-decoration: none;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -52,24 +52,24 @@ export const BaseButton = styled(RebassButton)< ...@@ -52,24 +52,24 @@ export const BaseButton = styled(RebassButton)<
` `
export const ButtonPrimary = styled(BaseButton)` export const ButtonPrimary = styled(BaseButton)`
background-color: ${({ theme }) => theme.primary1}; background-color: ${({ theme }) => theme.deprecated_primary1};
color: white; color: white;
&:focus { &:focus {
box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.primary1)}; box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.deprecated_primary1)};
background-color: ${({ theme }) => darken(0.05, theme.primary1)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_primary1)};
} }
&:hover { &:hover {
background-color: ${({ theme }) => darken(0.05, theme.primary1)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_primary1)};
} }
&:active { &:active {
box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.primary1)}; box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.deprecated_primary1)};
background-color: ${({ theme }) => darken(0.1, theme.primary1)}; background-color: ${({ theme }) => darken(0.1, theme.deprecated_primary1)};
} }
&:disabled { &:disabled {
background-color: ${({ theme, altDisabledStyle, disabled }) => background-color: ${({ theme, altDisabledStyle, disabled }) =>
altDisabledStyle ? (disabled ? theme.primary1 : theme.bg2) : theme.bg2}; altDisabledStyle ? (disabled ? theme.deprecated_primary1 : theme.deprecated_bg2) : theme.deprecated_bg2};
color: ${({ altDisabledStyle, disabled, theme }) => color: ${({ altDisabledStyle, disabled, theme }) =>
altDisabledStyle ? (disabled ? theme.white : theme.text2) : theme.text2}; altDisabledStyle ? (disabled ? theme.deprecated_white : theme.deprecated_text2) : theme.deprecated_text2};
cursor: auto; cursor: auto;
box-shadow: none; box-shadow: none;
border: 1px solid transparent; border: 1px solid transparent;
...@@ -78,26 +78,26 @@ export const ButtonPrimary = styled(BaseButton)` ...@@ -78,26 +78,26 @@ export const ButtonPrimary = styled(BaseButton)`
` `
export const ButtonLight = styled(BaseButton)` export const ButtonLight = styled(BaseButton)`
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
color: ${({ theme }) => theme.primaryText1}; color: ${({ theme }) => theme.deprecated_primaryText1};
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
&:focus { &:focus {
box-shadow: 0 0 0 1pt ${({ theme, disabled }) => !disabled && darken(0.03, theme.primary5)}; box-shadow: 0 0 0 1pt ${({ theme, disabled }) => !disabled && darken(0.03, theme.deprecated_primary5)};
background-color: ${({ theme, disabled }) => !disabled && darken(0.03, theme.primary5)}; background-color: ${({ theme, disabled }) => !disabled && darken(0.03, theme.deprecated_primary5)};
} }
&:hover { &:hover {
background-color: ${({ theme, disabled }) => !disabled && darken(0.03, theme.primary5)}; background-color: ${({ theme, disabled }) => !disabled && darken(0.03, theme.deprecated_primary5)};
} }
&:active { &:active {
box-shadow: 0 0 0 1pt ${({ theme, disabled }) => !disabled && darken(0.05, theme.primary5)}; box-shadow: 0 0 0 1pt ${({ theme, disabled }) => !disabled && darken(0.05, theme.deprecated_primary5)};
background-color: ${({ theme, disabled }) => !disabled && darken(0.05, theme.primary5)}; background-color: ${({ theme, disabled }) => !disabled && darken(0.05, theme.deprecated_primary5)};
} }
:disabled { :disabled {
opacity: 0.4; opacity: 0.4;
:hover { :hover {
cursor: auto; cursor: auto;
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
box-shadow: none; box-shadow: none;
border: 1px solid transparent; border: 1px solid transparent;
outline: none; outline: none;
...@@ -106,37 +106,37 @@ export const ButtonLight = styled(BaseButton)` ...@@ -106,37 +106,37 @@ export const ButtonLight = styled(BaseButton)`
` `
export const ButtonGray = styled(BaseButton)` export const ButtonGray = styled(BaseButton)`
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
&:hover { &:hover {
background-color: ${({ theme, disabled }) => !disabled && darken(0.05, theme.bg2)}; background-color: ${({ theme, disabled }) => !disabled && darken(0.05, theme.deprecated_bg2)};
} }
&:active { &:active {
background-color: ${({ theme, disabled }) => !disabled && darken(0.1, theme.bg2)}; background-color: ${({ theme, disabled }) => !disabled && darken(0.1, theme.deprecated_bg2)};
} }
` `
export const ButtonSecondary = styled(BaseButton)` export const ButtonSecondary = styled(BaseButton)`
border: 1px solid ${({ theme }) => theme.primary4}; border: 1px solid ${({ theme }) => theme.deprecated_primary4};
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
background-color: transparent; background-color: transparent;
font-size: 16px; font-size: 16px;
border-radius: 12px; border-radius: 12px;
padding: ${({ padding }) => (padding ? padding : '10px')}; padding: ${({ padding }) => (padding ? padding : '10px')};
&:focus { &:focus {
box-shadow: 0 0 0 1pt ${({ theme }) => theme.primary4}; box-shadow: 0 0 0 1pt ${({ theme }) => theme.deprecated_primary4};
border: 1px solid ${({ theme }) => theme.primary3}; border: 1px solid ${({ theme }) => theme.deprecated_primary3};
} }
&:hover { &:hover {
border: 1px solid ${({ theme }) => theme.primary3}; border: 1px solid ${({ theme }) => theme.deprecated_primary3};
} }
&:active { &:active {
box-shadow: 0 0 0 1pt ${({ theme }) => theme.primary4}; box-shadow: 0 0 0 1pt ${({ theme }) => theme.deprecated_primary4};
border: 1px solid ${({ theme }) => theme.primary3}; border: 1px solid ${({ theme }) => theme.deprecated_primary3};
} }
&:disabled { &:disabled {
opacity: 50%; opacity: 50%;
...@@ -148,17 +148,17 @@ export const ButtonSecondary = styled(BaseButton)` ...@@ -148,17 +148,17 @@ export const ButtonSecondary = styled(BaseButton)`
` `
export const ButtonOutlined = styled(BaseButton)` export const ButtonOutlined = styled(BaseButton)`
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
background-color: transparent; background-color: transparent;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
&:focus { &:focus {
box-shadow: 0 0 0 1px ${({ theme }) => theme.bg4}; box-shadow: 0 0 0 1px ${({ theme }) => theme.deprecated_bg4};
} }
&:hover { &:hover {
box-shadow: 0 0 0 1px ${({ theme }) => theme.bg4}; box-shadow: 0 0 0 1px ${({ theme }) => theme.deprecated_bg4};
} }
&:active { &:active {
box-shadow: 0 0 0 1px ${({ theme }) => theme.bg4}; box-shadow: 0 0 0 1px ${({ theme }) => theme.deprecated_bg4};
} }
&:disabled { &:disabled {
opacity: 50%; opacity: 50%;
...@@ -167,21 +167,21 @@ export const ButtonOutlined = styled(BaseButton)` ...@@ -167,21 +167,21 @@ export const ButtonOutlined = styled(BaseButton)`
` `
export const ButtonYellow = styled(BaseButton)` export const ButtonYellow = styled(BaseButton)`
background-color: ${({ theme }) => theme.yellow3}; background-color: ${({ theme }) => theme.deprecated_yellow3};
color: white; color: white;
&:focus { &:focus {
box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.yellow3)}; box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.deprecated_yellow3)};
background-color: ${({ theme }) => darken(0.05, theme.yellow3)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_yellow3)};
} }
&:hover { &:hover {
background-color: ${({ theme }) => darken(0.05, theme.yellow3)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_yellow3)};
} }
&:active { &:active {
box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.yellow3)}; box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.deprecated_yellow3)};
background-color: ${({ theme }) => darken(0.1, theme.yellow3)}; background-color: ${({ theme }) => darken(0.1, theme.deprecated_yellow3)};
} }
&:disabled { &:disabled {
background-color: ${({ theme }) => theme.yellow3}; background-color: ${({ theme }) => theme.deprecated_yellow3};
opacity: 50%; opacity: 50%;
cursor: auto; cursor: auto;
} }
...@@ -189,7 +189,7 @@ export const ButtonYellow = styled(BaseButton)` ...@@ -189,7 +189,7 @@ export const ButtonYellow = styled(BaseButton)`
export const ButtonEmpty = styled(BaseButton)` export const ButtonEmpty = styled(BaseButton)`
background-color: transparent; background-color: transparent;
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -232,39 +232,39 @@ export const ButtonText = styled(BaseButton)` ...@@ -232,39 +232,39 @@ export const ButtonText = styled(BaseButton)`
` `
const ButtonConfirmedStyle = styled(BaseButton)` const ButtonConfirmedStyle = styled(BaseButton)`
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
/* border: 1px solid ${({ theme }) => theme.green1}; */ /* border: 1px solid ${({ theme }) => theme.deprecated_green1}; */
&:disabled { &:disabled {
opacity: 50%; opacity: 50%;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
cursor: auto; cursor: auto;
} }
` `
const ButtonErrorStyle = styled(BaseButton)` const ButtonErrorStyle = styled(BaseButton)`
background-color: ${({ theme }) => theme.red1}; background-color: ${({ theme }) => theme.deprecated_red1};
border: 1px solid ${({ theme }) => theme.red1}; border: 1px solid ${({ theme }) => theme.deprecated_red1};
&:focus { &:focus {
box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.red1)}; box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.deprecated_red1)};
background-color: ${({ theme }) => darken(0.05, theme.red1)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_red1)};
} }
&:hover { &:hover {
background-color: ${({ theme }) => darken(0.05, theme.red1)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_red1)};
} }
&:active { &:active {
box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.red1)}; box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.deprecated_red1)};
background-color: ${({ theme }) => darken(0.1, theme.red1)}; background-color: ${({ theme }) => darken(0.1, theme.deprecated_red1)};
} }
&:disabled { &:disabled {
opacity: 50%; opacity: 50%;
cursor: auto; cursor: auto;
box-shadow: none; box-shadow: none;
background-color: ${({ theme }) => theme.red1}; background-color: ${({ theme }) => theme.deprecated_red1};
border: 1px solid ${({ theme }) => theme.red1}; border: 1px solid ${({ theme }) => theme.deprecated_red1};
} }
` `
...@@ -312,14 +312,14 @@ export function ButtonDropdownLight({ disabled = false, children, ...rest }: { d ...@@ -312,14 +312,14 @@ export function ButtonDropdownLight({ disabled = false, children, ...rest }: { d
const ActiveOutlined = styled(ButtonOutlined)` const ActiveOutlined = styled(ButtonOutlined)`
border: 1px solid; border: 1px solid;
border-color: ${({ theme }) => theme.primary1}; border-color: ${({ theme }) => theme.deprecated_primary1};
` `
const Circle = styled.div` const Circle = styled.div`
height: 17px; height: 17px;
width: 17px; width: 17px;
border-radius: 50%; border-radius: 50%;
background-color: ${({ theme }) => theme.primary1}; background-color: ${({ theme }) => theme.deprecated_primary1};
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -354,7 +354,7 @@ export function ButtonRadioChecked({ active = false, children, ...rest }: { acti ...@@ -354,7 +354,7 @@ export function ButtonRadioChecked({ active = false, children, ...rest }: { acti
{children} {children}
<CheckboxWrapper> <CheckboxWrapper>
<Circle> <Circle>
<ResponsiveCheck size={13} stroke={theme.white} /> <ResponsiveCheck size={13} stroke={theme.deprecated_white} />
</Circle> </Circle>
</CheckboxWrapper> </CheckboxWrapper>
</RowBetween> </RowBetween>
......
...@@ -10,38 +10,38 @@ const Card = styled(Box)<{ width?: string; padding?: string; border?: string; $b ...@@ -10,38 +10,38 @@ const Card = styled(Box)<{ width?: string; padding?: string; border?: string; $b
export default Card export default Card
export const LightCard = styled(Card)` export const LightCard = styled(Card)`
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
` `
export const LightGreyCard = styled(Card)` export const LightGreyCard = styled(Card)`
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
` `
export const GreyCard = styled(Card)` export const GreyCard = styled(Card)`
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
` `
export const DarkGreyCard = styled(Card)` export const DarkGreyCard = styled(Card)`
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
` `
export const DarkCard = styled(Card)` export const DarkCard = styled(Card)`
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
` `
export const OutlineCard = styled(Card)` export const OutlineCard = styled(Card)`
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
` `
export const YellowCard = styled(Card)` export const YellowCard = styled(Card)`
background-color: rgba(243, 132, 30, 0.05); background-color: rgba(243, 132, 30, 0.05);
color: ${({ theme }) => theme.yellow3}; color: ${({ theme }) => theme.deprecated_yellow3};
font-weight: 500; font-weight: 500;
` `
export const BlueCard = styled(Card)` export const BlueCard = styled(Card)`
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
color: ${({ theme }) => theme.blue2}; color: ${({ theme }) => theme.deprecated_blue2};
border-radius: 12px; border-radius: 12px;
` `
...@@ -16,7 +16,7 @@ const ContentWrapper = styled(Column)` ...@@ -16,7 +16,7 @@ const ContentWrapper = styled(Column)`
const WarningIcon = styled(AlertOctagon)` const WarningIcon = styled(AlertOctagon)`
min-height: 22px; min-height: 22px;
min-width: 22px; min-width: 22px;
color: ${({ theme }) => theme.warning}; color: ${({ theme }) => theme.deprecated_warning};
` `
const Copy = styled(CopyHelper)` const Copy = styled(CopyHelper)`
font-size: 12px; font-size: 12px;
...@@ -49,7 +49,7 @@ export default function ConnectedAccountBlocked(props: ConnectedAccountBlockedPr ...@@ -49,7 +49,7 @@ export default function ConnectedAccountBlocked(props: ConnectedAccountBlockedPr
<ThemedText.Main fontSize={12}> <ThemedText.Main fontSize={12}>
<Trans>If you believe this is an error, please send an email including your address to </Trans>{' '} <Trans>If you believe this is an error, please send an email including your address to </Trans>{' '}
</ThemedText.Main> </ThemedText.Main>
<Copy iconSize={12} toCopy="compliance@uniswap.org" color={theme.primary1} iconPosition="right"> <Copy iconSize={12} toCopy="compliance@uniswap.org" color={theme.deprecated_primary1} iconPosition="right">
compliance@uniswap.org compliance@uniswap.org
</Copy> </Copy>
</ContentWrapper> </ContentWrapper>
......
...@@ -20,24 +20,24 @@ export function FiatValue({ ...@@ -20,24 +20,24 @@ export function FiatValue({
const theme = useTheme() const theme = useTheme()
const priceImpactColor = useMemo(() => { const priceImpactColor = useMemo(() => {
if (!priceImpact) return undefined if (!priceImpact) return undefined
if (priceImpact.lessThan('0')) return theme.green1 if (priceImpact.lessThan('0')) return theme.deprecated_green1
const severity = warningSeverity(priceImpact) const severity = warningSeverity(priceImpact)
if (severity < 1) return theme.text3 if (severity < 1) return theme.deprecated_text3
if (severity < 3) return theme.yellow1 if (severity < 3) return theme.deprecated_yellow1
return theme.red1 return theme.deprecated_red1
}, [priceImpact, theme.green1, theme.red1, theme.text3, theme.yellow1]) }, [priceImpact, theme.deprecated_green1, theme.deprecated_red1, theme.deprecated_text3, theme.deprecated_yellow1])
const p = Number(fiatValue?.toFixed()) const p = Number(fiatValue?.toFixed())
const visibleDecimalPlaces = p < 1.05 ? 4 : 2 const visibleDecimalPlaces = p < 1.05 ? 4 : 2
return ( return (
<ThemedText.Body fontSize={14} color={fiatValue ? theme.text3 : theme.text4}> <ThemedText.Body fontSize={14} color={fiatValue ? theme.deprecated_text3 : theme.deprecated_text4}>
{fiatValue ? ( {fiatValue ? (
<Trans> <Trans>
$ $
<HoverInlineText <HoverInlineText
text={fiatValue?.toFixed(visibleDecimalPlaces, { groupSeparator: ',' })} text={fiatValue?.toFixed(visibleDecimalPlaces, { groupSeparator: ',' })}
textColor={fiatValue ? theme.text3 : theme.text4} textColor={fiatValue ? theme.deprecated_text3 : theme.deprecated_text4}
/> />
</Trans> </Trans>
) : ( ) : (
......
...@@ -26,7 +26,7 @@ const InputPanel = styled.div<{ hideInput?: boolean }>` ...@@ -26,7 +26,7 @@ const InputPanel = styled.div<{ hideInput?: boolean }>`
${({ theme }) => theme.flexColumnNoWrap} ${({ theme }) => theme.flexColumnNoWrap}
position: relative; position: relative;
border-radius: ${({ hideInput }) => (hideInput ? '16px' : '20px')}; border-radius: ${({ hideInput }) => (hideInput ? '16px' : '20px')};
background-color: ${({ theme, hideInput }) => (hideInput ? 'transparent' : theme.bg2)}; background-color: ${({ theme, hideInput }) => (hideInput ? 'transparent' : theme.deprecated_bg2)};
z-index: 1; z-index: 1;
width: ${({ hideInput }) => (hideInput ? '100%' : 'initial')}; width: ${({ hideInput }) => (hideInput ? '100%' : 'initial')};
transition: height 1s ease; transition: height 1s ease;
...@@ -38,7 +38,7 @@ const FixedContainer = styled.div` ...@@ -38,7 +38,7 @@ const FixedContainer = styled.div`
height: 100%; height: 100%;
position: absolute; position: absolute;
border-radius: 20px; border-radius: 20px;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -47,21 +47,21 @@ const FixedContainer = styled.div` ...@@ -47,21 +47,21 @@ const FixedContainer = styled.div`
const Container = styled.div<{ hideInput: boolean }>` const Container = styled.div<{ hideInput: boolean }>`
border-radius: ${({ hideInput }) => (hideInput ? '16px' : '20px')}; border-radius: ${({ hideInput }) => (hideInput ? '16px' : '20px')};
border: 1px solid ${({ theme }) => theme.bg0}; border: 1px solid ${({ theme }) => theme.deprecated_bg0};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
width: ${({ hideInput }) => (hideInput ? '100%' : 'initial')}; width: ${({ hideInput }) => (hideInput ? '100%' : 'initial')};
:focus, :focus,
:hover { :hover {
border: 1px solid ${({ theme, hideInput }) => (hideInput ? ' transparent' : theme.bg3)}; border: 1px solid ${({ theme, hideInput }) => (hideInput ? ' transparent' : theme.deprecated_bg3)};
} }
` `
const CurrencySelect = styled(ButtonGray)<{ visible: boolean; selected: boolean; hideInput?: boolean }>` const CurrencySelect = styled(ButtonGray)<{ visible: boolean; selected: boolean; hideInput?: boolean }>`
align-items: center; align-items: center;
background-color: ${({ selected, theme }) => (selected ? theme.bg2 : theme.primary1)}; background-color: ${({ selected, theme }) => (selected ? theme.deprecated_bg2 : theme.deprecated_primary1)};
box-shadow: ${({ selected }) => (selected ? 'none' : '0px 6px 10px rgba(0, 0, 0, 0.075)')}; box-shadow: ${({ selected }) => (selected ? 'none' : '0px 6px 10px rgba(0, 0, 0, 0.075)')};
box-shadow: 0px 6px 10px rgba(0, 0, 0, 0.075); box-shadow: 0px 6px 10px rgba(0, 0, 0, 0.075);
color: ${({ selected, theme }) => (selected ? theme.text1 : theme.white)}; color: ${({ selected, theme }) => (selected ? theme.deprecated_text1 : theme.deprecated_white)};
cursor: pointer; cursor: pointer;
border-radius: 16px; border-radius: 16px;
outline: none; outline: none;
...@@ -76,7 +76,8 @@ const CurrencySelect = styled(ButtonGray)<{ visible: boolean; selected: boolean; ...@@ -76,7 +76,8 @@ const CurrencySelect = styled(ButtonGray)<{ visible: boolean; selected: boolean;
margin-left: ${({ hideInput }) => (hideInput ? '0' : '12px')}; margin-left: ${({ hideInput }) => (hideInput ? '0' : '12px')};
:focus, :focus,
:hover { :hover {
background-color: ${({ selected, theme }) => (selected ? theme.bg3 : darken(0.05, theme.primary1))}; background-color: ${({ selected, theme }) =>
selected ? theme.deprecated_bg3 : darken(0.05, theme.deprecated_primary1)};
} }
visibility: ${({ visible }) => (visible ? 'visible' : 'hidden')}; visibility: ${({ visible }) => (visible ? 'visible' : 'hidden')};
` `
...@@ -91,13 +92,13 @@ const InputRow = styled.div<{ selected: boolean }>` ...@@ -91,13 +92,13 @@ const InputRow = styled.div<{ selected: boolean }>`
const LabelRow = styled.div` const LabelRow = styled.div`
${({ theme }) => theme.flexRowNoWrap} ${({ theme }) => theme.flexRowNoWrap}
align-items: center; align-items: center;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
font-size: 0.75rem; font-size: 0.75rem;
line-height: 1rem; line-height: 1rem;
padding: 0 1rem 1rem; padding: 0 1rem 1rem;
span:hover { span:hover {
cursor: pointer; cursor: pointer;
color: ${({ theme }) => darken(0.2, theme.text2)}; color: ${({ theme }) => darken(0.2, theme.deprecated_text2)};
} }
` `
...@@ -118,7 +119,7 @@ const StyledDropDown = styled(DropDown)<{ selected: boolean }>` ...@@ -118,7 +119,7 @@ const StyledDropDown = styled(DropDown)<{ selected: boolean }>`
height: 35%; height: 35%;
path { path {
stroke: ${({ selected, theme }) => (selected ? theme.text1 : theme.white)}; stroke: ${({ selected, theme }) => (selected ? theme.deprecated_text1 : theme.deprecated_white)};
stroke-width: 1.5px; stroke-width: 1.5px;
} }
` `
...@@ -130,10 +131,10 @@ const StyledTokenName = styled.span<{ active?: boolean }>` ...@@ -130,10 +131,10 @@ const StyledTokenName = styled.span<{ active?: boolean }>`
const StyledBalanceMax = styled.button<{ disabled?: boolean }>` const StyledBalanceMax = styled.button<{ disabled?: boolean }>`
background-color: transparent; background-color: transparent;
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
border: none; border: none;
border-radius: 12px; border-radius: 12px;
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
cursor: pointer; cursor: pointer;
font-size: 11px; font-size: 11px;
font-weight: 500; font-weight: 500;
...@@ -281,7 +282,7 @@ export default function CurrencyInputPanel({ ...@@ -281,7 +282,7 @@ export default function CurrencyInputPanel({
<RowFixed style={{ height: '17px' }}> <RowFixed style={{ height: '17px' }}>
<ThemedText.Body <ThemedText.Body
onClick={onMax} onClick={onMax}
color={theme.text3} color={theme.deprecated_text3}
fontWeight={500} fontWeight={500}
fontSize={14} fontSize={14}
style={{ display: 'inline', cursor: 'pointer' }} style={{ display: 'inline', cursor: 'pointer' }}
......
...@@ -24,18 +24,18 @@ const BodyWrapper = styled.div<{ margin?: string }>` ...@@ -24,18 +24,18 @@ const BodyWrapper = styled.div<{ margin?: string }>`
` `
const CodeBlockWrapper = styled.div` const CodeBlockWrapper = styled.div`
background: ${({ theme }) => theme.bg0}; background: ${({ theme }) => theme.deprecated_bg0};
overflow: auto; overflow: auto;
white-space: pre; white-space: pre;
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04), box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
0px 24px 32px rgba(0, 0, 0, 0.01); 0px 24px 32px rgba(0, 0, 0, 0.01);
border-radius: 24px; border-radius: 24px;
padding: 18px 24px; padding: 18px 24px;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
` `
const LinkWrapper = styled.div` const LinkWrapper = styled.div`
color: ${({ theme }) => theme.blue1}; color: ${({ theme }) => theme.deprecated_blue1};
padding: 6px 24px; padding: 6px 24px;
` `
......
...@@ -34,8 +34,8 @@ const pulse = (color: string) => keyframes` ...@@ -34,8 +34,8 @@ const pulse = (color: string) => keyframes`
} }
` `
const FocusedOutlineCard = styled(Card)<{ pulsing: boolean }>` const FocusedOutlineCard = styled(Card)<{ pulsing: boolean }>`
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
animation: ${({ pulsing, theme }) => pulsing && pulse(theme.primary1)} 0.6s linear; animation: ${({ pulsing, theme }) => pulsing && pulse(theme.deprecated_primary1)} 0.6s linear;
align-self: center; align-self: center;
` `
......
...@@ -7,14 +7,14 @@ import styled from 'styled-components/macro' ...@@ -7,14 +7,14 @@ import styled from 'styled-components/macro'
import { ExternalLink, MEDIA_WIDTHS } from 'theme' import { ExternalLink, MEDIA_WIDTHS } from 'theme'
const BodyRow = styled.div` const BodyRow = styled.div`
color: ${({ theme }) => theme.black}; color: ${({ theme }) => theme.deprecated_black};
font-size: 12px; font-size: 12px;
` `
const CautionIcon = styled(AlertOctagon)` const CautionIcon = styled(AlertOctagon)`
color: ${({ theme }) => theme.black}; color: ${({ theme }) => theme.deprecated_black};
` `
const Link = styled(ExternalLink)` const Link = styled(ExternalLink)`
color: ${({ theme }) => theme.black}; color: ${({ theme }) => theme.deprecated_black};
text-decoration: underline; text-decoration: underline;
` `
const TitleRow = styled.div` const TitleRow = styled.div`
...@@ -31,7 +31,7 @@ const TitleText = styled.div` ...@@ -31,7 +31,7 @@ const TitleText = styled.div`
margin: 0px 12px; margin: 0px 12px;
` `
const Wrapper = styled.div` const Wrapper = styled.div`
background-color: ${({ theme }) => theme.yellow3}; background-color: ${({ theme }) => theme.deprecated_yellow3};
border-radius: 12px; border-radius: 12px;
bottom: 60px; bottom: 60px;
display: none; display: none;
......
...@@ -25,7 +25,7 @@ const ActiveRowLinkList = styled.div` ...@@ -25,7 +25,7 @@ const ActiveRowLinkList = styled.div`
padding: 0 8px; padding: 0 8px;
& > a { & > a {
align-items: center; align-items: center;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
display: flex; display: flex;
flex-direction: row; flex-direction: row;
font-size: 14px; font-size: 14px;
...@@ -41,14 +41,14 @@ const ActiveRowLinkList = styled.div` ...@@ -41,14 +41,14 @@ const ActiveRowLinkList = styled.div`
} }
` `
const ActiveRowWrapper = styled.div` const ActiveRowWrapper = styled.div`
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
padding: 8px; padding: 8px;
width: 100%; width: 100%;
` `
const FlyoutHeader = styled.div` const FlyoutHeader = styled.div`
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-weight: 400; font-weight: 400;
` `
const FlyoutMenu = styled.div` const FlyoutMenu = styled.div`
...@@ -63,7 +63,7 @@ const FlyoutMenu = styled.div` ...@@ -63,7 +63,7 @@ const FlyoutMenu = styled.div`
` `
const FlyoutMenuContents = styled.div` const FlyoutMenuContents = styled.div`
align-items: flex-start; align-items: flex-start;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04), box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
0px 24px 32px rgba(0, 0, 0, 0.01); 0px 24px 32px rgba(0, 0, 0, 0.01);
border-radius: 20px; border-radius: 20px;
...@@ -78,7 +78,7 @@ const FlyoutMenuContents = styled.div` ...@@ -78,7 +78,7 @@ const FlyoutMenuContents = styled.div`
` `
const FlyoutRow = styled.div<{ active: boolean }>` const FlyoutRow = styled.div<{ active: boolean }>`
align-items: center; align-items: center;
background-color: ${({ active, theme }) => (active ? theme.bg1 : 'transparent')}; background-color: ${({ active, theme }) => (active ? theme.deprecated_bg1 : 'transparent')};
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
...@@ -89,7 +89,7 @@ const FlyoutRow = styled.div<{ active: boolean }>` ...@@ -89,7 +89,7 @@ const FlyoutRow = styled.div<{ active: boolean }>`
width: 100%; width: 100%;
` `
const FlyoutRowActiveIndicator = styled.div` const FlyoutRowActiveIndicator = styled.div`
background-color: ${({ theme }) => theme.green1}; background-color: ${({ theme }) => theme.deprecated_green1};
border-radius: 50%; border-radius: 50%;
height: 9px; height: 9px;
width: 9px; width: 9px;
...@@ -123,10 +123,10 @@ const SelectorLabel = styled(NetworkLabel)` ...@@ -123,10 +123,10 @@ const SelectorLabel = styled(NetworkLabel)`
` `
const SelectorControls = styled.div` const SelectorControls = styled.div`
align-items: center; align-items: center;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
border: 2px solid ${({ theme }) => theme.bg0}; border: 2px solid ${({ theme }) => theme.deprecated_bg0};
border-radius: 16px; border-radius: 16px;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
display: flex; display: flex;
font-weight: 500; font-weight: 500;
justify-content: space-between; justify-content: space-between;
......
...@@ -24,7 +24,7 @@ const StyledPolling = styled.div<{ warning: boolean }>` ...@@ -24,7 +24,7 @@ const StyledPolling = styled.div<{ warning: boolean }>`
right: 0; right: 0;
bottom: 0; bottom: 0;
padding: 1rem; padding: 1rem;
color: ${({ theme, warning }) => (warning ? theme.yellow3 : theme.green1)}; color: ${({ theme, warning }) => (warning ? theme.deprecated_yellow3 : theme.deprecated_green1)};
transition: 250ms ease color; transition: 250ms ease color;
${({ theme }) => theme.mediaWidth.upToMedium` ${({ theme }) => theme.mediaWidth.upToMedium`
...@@ -53,12 +53,12 @@ const StyledPollingDot = styled.div<{ warning: boolean }>` ...@@ -53,12 +53,12 @@ const StyledPollingDot = styled.div<{ warning: boolean }>`
min-width: 8px; min-width: 8px;
border-radius: 50%; border-radius: 50%;
position: relative; position: relative;
background-color: ${({ theme, warning }) => (warning ? theme.yellow3 : theme.green1)}; background-color: ${({ theme, warning }) => (warning ? theme.deprecated_yellow3 : theme.deprecated_green1)};
transition: 250ms ease background-color; transition: 250ms ease background-color;
` `
const StyledGasDot = styled.div` const StyledGasDot = styled.div`
background-color: ${({ theme }) => theme.text3}; background-color: ${({ theme }) => theme.deprecated_text3};
border-radius: 50%; border-radius: 50%;
height: 4px; height: 4px;
min-height: 4px; min-height: 4px;
...@@ -84,7 +84,7 @@ const Spinner = styled.div<{ warning: boolean }>` ...@@ -84,7 +84,7 @@ const Spinner = styled.div<{ warning: boolean }>`
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-right: 1px solid transparent; border-right: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
border-left: 2px solid ${({ theme, warning }) => (warning ? theme.yellow3 : theme.green1)}; border-left: 2px solid ${({ theme, warning }) => (warning ? theme.deprecated_yellow3 : theme.deprecated_green1)};
background: transparent; background: transparent;
width: 14px; width: 14px;
height: 14px; height: 14px;
...@@ -143,7 +143,7 @@ export default function Polling() { ...@@ -143,7 +143,7 @@ export default function Polling() {
<ExternalLink href={'https://etherscan.io/gastracker'}> <ExternalLink href={'https://etherscan.io/gastracker'}>
{priceGwei ? ( {priceGwei ? (
<RowFixed style={{ marginRight: '8px' }}> <RowFixed style={{ marginRight: '8px' }}>
<ThemedText.Main fontSize="11px" mr="8px" color={theme.text3}> <ThemedText.Main fontSize="11px" mr="8px" color={theme.deprecated_text3}>
<MouseoverTooltip <MouseoverTooltip
text={ text={
<Trans> <Trans>
......
...@@ -39,10 +39,10 @@ const HeaderFrame = styled.div<{ showBackground: boolean }>` ...@@ -39,10 +39,10 @@ const HeaderFrame = styled.div<{ showBackground: boolean }>`
z-index: 21; z-index: 21;
position: relative; position: relative;
/* Background slide effect on scroll. */ /* Background slide effect on scroll. */
background-image: ${({ theme }) => `linear-gradient(to bottom, transparent 50%, ${theme.bg0} 50% )}}`}; background-image: ${({ theme }) => `linear-gradient(to bottom, transparent 50%, ${theme.deprecated_bg0} 50% )}}`};
background-position: ${({ showBackground }) => (showBackground ? '0 -100%' : '0 0')}; background-position: ${({ showBackground }) => (showBackground ? '0 -100%' : '0 0')};
background-size: 100% 200%; background-size: 100% 200%;
box-shadow: 0px 0px 0px 1px ${({ theme, showBackground }) => (showBackground ? theme.bg2 : 'transparent;')}; box-shadow: 0px 0px 0px 1px ${({ theme, showBackground }) => (showBackground ? theme.deprecated_bg2 : 'transparent;')};
transition: background-position 0.1s, box-shadow 0.1s; transition: background-position 0.1s, box-shadow 0.1s;
background-blend-mode: hard-light; background-blend-mode: hard-light;
...@@ -88,7 +88,7 @@ const HeaderElement = styled.div` ...@@ -88,7 +88,7 @@ const HeaderElement = styled.div`
const HeaderLinks = styled(Row)` const HeaderLinks = styled(Row)`
justify-self: center; justify-self: center;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
width: fit-content; width: fit-content;
padding: 2px; padding: 2px;
border-radius: 16px; border-radius: 16px;
...@@ -112,8 +112,8 @@ const HeaderLinks = styled(Row)` ...@@ -112,8 +112,8 @@ const HeaderLinks = styled(Row)`
bottom: 0; right: 50%; bottom: 0; right: 50%;
transform: translate(50%,-50%); transform: translate(50%,-50%);
margin: 0 auto; margin: 0 auto;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
box-shadow: 0px 6px 10px rgb(0 0 0 / 2%); box-shadow: 0px 6px 10px rgb(0 0 0 / 2%);
`}; `};
` `
...@@ -122,7 +122,7 @@ const AccountElement = styled.div<{ active: boolean }>` ...@@ -122,7 +122,7 @@ const AccountElement = styled.div<{ active: boolean }>`
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
background-color: ${({ theme, active }) => (!active ? theme.bg0 : theme.bg0)}; background-color: ${({ theme, active }) => (!active ? theme.deprecated_bg0 : theme.deprecated_bg0)};
border-radius: 16px; border-radius: 16px;
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
...@@ -138,7 +138,7 @@ const UNIAmount = styled(AccountElement)` ...@@ -138,7 +138,7 @@ const UNIAmount = styled(AccountElement)`
padding: 4px 8px; padding: 4px 8px;
height: 36px; height: 36px;
font-weight: 500; font-weight: 500;
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
background: radial-gradient(174.47% 188.91% at 1.84% 0%, #ff007a 0%, #2172e5 100%), #edeef2; background: radial-gradient(174.47% 188.91% at 1.84% 0%, #ff007a 0%, #2172e5 100%), #edeef2;
` `
...@@ -196,7 +196,7 @@ const StyledNavLink = styled(NavLink).attrs({ ...@@ -196,7 +196,7 @@ const StyledNavLink = styled(NavLink).attrs({
outline: none; outline: none;
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 1rem; font-size: 1rem;
font-weight: 500; font-weight: 500;
padding: 8px 12px; padding: 8px 12px;
...@@ -207,13 +207,13 @@ const StyledNavLink = styled(NavLink).attrs({ ...@@ -207,13 +207,13 @@ const StyledNavLink = styled(NavLink).attrs({
border-radius: 14px; border-radius: 14px;
font-weight: 600; font-weight: 600;
justify-content: center; justify-content: center;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
} }
:hover, :hover,
:focus { :focus {
color: ${({ theme }) => darken(0.1, theme.text1)}; color: ${({ theme }) => darken(0.1, theme.deprecated_text1)};
} }
` `
...@@ -226,7 +226,7 @@ const StyledExternalLink = styled(ExternalLink).attrs({ ...@@ -226,7 +226,7 @@ const StyledExternalLink = styled(ExternalLink).attrs({
outline: none; outline: none;
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 1rem; font-size: 1rem;
width: fit-content; width: fit-content;
margin: 0 12px; margin: 0 12px;
...@@ -235,12 +235,12 @@ const StyledExternalLink = styled(ExternalLink).attrs({ ...@@ -235,12 +235,12 @@ const StyledExternalLink = styled(ExternalLink).attrs({
&.${activeClassName} { &.${activeClassName} {
border-radius: 14px; border-radius: 14px;
font-weight: 600; font-weight: 600;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
} }
:hover, :hover,
:focus { :focus {
color: ${({ theme }) => darken(0.1, theme.text1)}; color: ${({ theme }) => darken(0.1, theme.deprecated_text1)};
text-decoration: none; text-decoration: none;
} }
` `
...@@ -250,7 +250,7 @@ export default function Header() { ...@@ -250,7 +250,7 @@ export default function Header() {
const userEthBalance = useNativeCurrencyBalances(account ? [account] : [])?.[account ?? ''] const userEthBalance = useNativeCurrencyBalances(account ? [account] : [])?.[account ?? '']
const [darkMode] = useDarkModeManager() const [darkMode] = useDarkModeManager()
const { white, black } = useTheme() const { deprecated_white, deprecated_black } = useTheme()
const toggleClaimModal = useToggleSelfClaimModal() const toggleClaimModal = useToggleSelfClaimModal()
...@@ -272,7 +272,7 @@ export default function Header() { ...@@ -272,7 +272,7 @@ export default function Header() {
<ClaimModal /> <ClaimModal />
<Title href="."> <Title href=".">
<UniIcon> <UniIcon>
<Logo fill={darkMode ? white : black} width="24px" height="100%" title="logo" /> <Logo fill={darkMode ? deprecated_white : deprecated_black} width="24px" height="100%" title="logo" />
<HolidayOrnament /> <HolidayOrnament />
</UniIcon> </UniIcon>
</Title> </Title>
......
...@@ -10,7 +10,7 @@ const TextWrapper = styled.span<{ ...@@ -10,7 +10,7 @@ const TextWrapper = styled.span<{
textColor?: string textColor?: string
}>` }>`
margin-left: ${({ margin }) => margin && '4px'}; margin-left: ${({ margin }) => margin && '4px'};
color: ${({ theme, link, textColor }) => (link ? theme.blue1 : textColor ?? theme.text1)}; color: ${({ theme, link, textColor }) => (link ? theme.deprecated_blue1 : textColor ?? theme.deprecated_text1)};
font-size: ${({ fontSize }) => fontSize ?? 'inherit'}; font-size: ${({ fontSize }) => fontSize ?? 'inherit'};
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
......
...@@ -8,7 +8,7 @@ const StyledIdenticon = styled.div` ...@@ -8,7 +8,7 @@ const StyledIdenticon = styled.div`
height: 1rem; height: 1rem;
width: 1rem; width: 1rem;
border-radius: 1.125rem; border-radius: 1.125rem;
background-color: ${({ theme }) => theme.bg4}; background-color: ${({ theme }) => theme.deprecated_bg4};
font-size: initial; font-size: initial;
` `
......
...@@ -36,9 +36,9 @@ const SmallButton = styled(ButtonGray)` ...@@ -36,9 +36,9 @@ const SmallButton = styled(ButtonGray)`
` `
const FocusedOutlineCard = styled(OutlineCard)<{ active?: boolean; pulsing?: boolean }>` const FocusedOutlineCard = styled(OutlineCard)<{ active?: boolean; pulsing?: boolean }>`
border-color: ${({ active, theme }) => active && theme.blue1}; border-color: ${({ active, theme }) => active && theme.deprecated_blue1};
padding: 12px; padding: 12px;
animation: ${({ pulsing, theme }) => pulsing && pulse(theme.blue1)} 0.8s linear; animation: ${({ pulsing, theme }) => pulsing && pulse(theme.deprecated_blue1)} 0.8s linear;
` `
const StyledInput = styled(NumericalInput)<{ usePercent?: boolean }>` const StyledInput = styled(NumericalInput)<{ usePercent?: boolean }>`
...@@ -58,13 +58,13 @@ const StyledInput = styled(NumericalInput)<{ usePercent?: boolean }>` ...@@ -58,13 +58,13 @@ const StyledInput = styled(NumericalInput)<{ usePercent?: boolean }>`
` `
const InputTitle = styled(ThemedText.Small)` const InputTitle = styled(ThemedText.Small)`
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 12px; font-size: 12px;
font-weight: 500; font-weight: 500;
` `
const ButtonLabel = styled(ThemedText.White)<{ disabled: boolean }>` const ButtonLabel = styled(ThemedText.White)<{ disabled: boolean }>`
color: ${({ theme, disabled }) => (disabled ? theme.text2 : theme.text1)} !important; color: ${({ theme, disabled }) => (disabled ? theme.deprecated_text2 : theme.deprecated_text1)} !important;
` `
interface StepCounterProps { interface StepCounterProps {
......
...@@ -6,8 +6,8 @@ import { ChartEntry } from './types' ...@@ -6,8 +6,8 @@ import { ChartEntry } from './types'
const Path = styled.path<{ fill: string | undefined }>` const Path = styled.path<{ fill: string | undefined }>`
opacity: 0.5; opacity: 0.5;
stroke: ${({ fill, theme }) => fill ?? theme.blue2}; stroke: ${({ fill, theme }) => fill ?? theme.deprecated_blue2};
fill: ${({ fill, theme }) => fill ?? theme.blue2}; fill: ${({ fill, theme }) => fill ?? theme.deprecated_blue2};
` `
export const Area = ({ export const Area = ({
......
...@@ -8,7 +8,7 @@ const StyledGroup = styled.g` ...@@ -8,7 +8,7 @@ const StyledGroup = styled.g`
} }
text { text {
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
transform: translateY(5px); transform: translateY(5px);
} }
` `
......
...@@ -18,7 +18,7 @@ const HandleAccent = styled.path` ...@@ -18,7 +18,7 @@ const HandleAccent = styled.path`
pointer-events: none; pointer-events: none;
stroke-width: 1.5; stroke-width: 1.5;
stroke: ${({ theme }) => theme.white}; stroke: ${({ theme }) => theme.deprecated_white};
opacity: 0.6; opacity: 0.6;
` `
...@@ -28,13 +28,13 @@ const LabelGroup = styled.g<{ visible: boolean }>` ...@@ -28,13 +28,13 @@ const LabelGroup = styled.g<{ visible: boolean }>`
` `
const TooltipBackground = styled.rect` const TooltipBackground = styled.rect`
fill: ${({ theme }) => theme.bg2}; fill: ${({ theme }) => theme.deprecated_bg2};
` `
const Tooltip = styled.text` const Tooltip = styled.text`
text-anchor: middle; text-anchor: middle;
font-size: 13px; font-size: 13px;
fill: ${({ theme }) => theme.text1}; fill: ${({ theme }) => theme.deprecated_text1};
` `
// flips the handles draggers when close to the container edges // flips the handles draggers when close to the container edges
......
...@@ -5,7 +5,7 @@ import styled from 'styled-components/macro' ...@@ -5,7 +5,7 @@ import styled from 'styled-components/macro'
const StyledLine = styled.line` const StyledLine = styled.line`
opacity: 0.5; opacity: 0.5;
stroke-width: 2; stroke-width: 2;
stroke: ${({ theme }) => theme.text1}; stroke: ${({ theme }) => theme.deprecated_text1};
fill: none; fill: none;
` `
......
...@@ -18,8 +18,8 @@ const Wrapper = styled.div<{ count: number }>` ...@@ -18,8 +18,8 @@ const Wrapper = styled.div<{ count: number }>`
const Button = styled(ButtonGray)` const Button = styled(ButtonGray)`
&:hover { &:hover {
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
} }
width: 32px; width: 32px;
......
...@@ -166,19 +166,19 @@ export default function LiquidityChartRangeInput({ ...@@ -166,19 +166,19 @@ export default function LiquidityChartRangeInput({
{isUninitialized ? ( {isUninitialized ? (
<InfoBox <InfoBox
message={<Trans>Your position will appear here.</Trans>} message={<Trans>Your position will appear here.</Trans>}
icon={<Inbox size={56} stroke={theme.text1} />} icon={<Inbox size={56} stroke={theme.deprecated_text1} />}
/> />
) : isLoading ? ( ) : isLoading ? (
<InfoBox icon={<Loader size="40px" stroke={theme.text4} />} /> <InfoBox icon={<Loader size="40px" stroke={theme.deprecated_text4} />} />
) : isError ? ( ) : isError ? (
<InfoBox <InfoBox
message={<Trans>Liquidity data not available.</Trans>} message={<Trans>Liquidity data not available.</Trans>}
icon={<CloudOff size={56} stroke={theme.text4} />} icon={<CloudOff size={56} stroke={theme.deprecated_text4} />}
/> />
) : !formattedData || formattedData === [] || !price ? ( ) : !formattedData || formattedData === [] || !price ? (
<InfoBox <InfoBox
message={<Trans>There is no liquidity data.</Trans>} message={<Trans>There is no liquidity data.</Trans>}
icon={<BarChart2 size={56} stroke={theme.text4} />} icon={<BarChart2 size={56} stroke={theme.deprecated_text4} />}
/> />
) : ( ) : (
<ChartWrapper> <ChartWrapper>
...@@ -188,12 +188,12 @@ export default function LiquidityChartRangeInput({ ...@@ -188,12 +188,12 @@ export default function LiquidityChartRangeInput({
margins={{ top: 10, right: 2, bottom: 20, left: 0 }} margins={{ top: 10, right: 2, bottom: 20, left: 0 }}
styles={{ styles={{
area: { area: {
selection: theme.blue1, selection: theme.deprecated_blue1,
}, },
brush: { brush: {
handle: { handle: {
west: saturate(0.1, tokenAColor) ?? theme.red1, west: saturate(0.1, tokenAColor) ?? theme.deprecated_red1,
east: saturate(0.1, tokenBColor) ?? theme.blue1, east: saturate(0.1, tokenBColor) ?? theme.deprecated_blue1,
}, },
}, },
}} }}
......
...@@ -14,7 +14,7 @@ const StyledSVG = styled.svg<{ size: string; stroke?: string }>` ...@@ -14,7 +14,7 @@ const StyledSVG = styled.svg<{ size: string; stroke?: string }>`
height: ${({ size }) => size}; height: ${({ size }) => size};
width: ${({ size }) => size}; width: ${({ size }) => size};
path { path {
stroke: ${({ stroke, theme }) => stroke ?? theme.primary1}; stroke: ${({ stroke, theme }) => stroke ?? theme.deprecated_primary1};
} }
` `
......
...@@ -17,9 +17,9 @@ export const LoadingRows = styled.div` ...@@ -17,9 +17,9 @@ export const LoadingRows = styled.div`
animation-fill-mode: both; animation-fill-mode: both;
background: linear-gradient( background: linear-gradient(
to left, to left,
${({ theme }) => theme.bg1} 25%, ${({ theme }) => theme.deprecated_bg1} 25%,
${({ theme }) => theme.bg2} 50%, ${({ theme }) => theme.deprecated_bg2} 50%,
${({ theme }) => theme.bg1} 75% ${({ theme }) => theme.deprecated_bg1} 75%
); );
background-size: 400%; background-size: 400%;
border-radius: 12px; border-radius: 12px;
......
...@@ -35,5 +35,5 @@ export default function Logo({ srcs, alt, style, ...rest }: LogoProps) { ...@@ -35,5 +35,5 @@ export default function Logo({ srcs, alt, style, ...rest }: LogoProps) {
) )
} }
return <Slash {...rest} style={{ ...style, color: theme.bg4 }} /> return <Slash {...rest} style={{ ...style, color: theme.deprecated_bg4 }} />
} }
...@@ -38,7 +38,7 @@ export enum FlyoutAlignment { ...@@ -38,7 +38,7 @@ export enum FlyoutAlignment {
const StyledMenuIcon = styled(MenuIcon)` const StyledMenuIcon = styled(MenuIcon)`
path { path {
stroke: ${({ theme }) => theme.text1}; stroke: ${({ theme }) => theme.deprecated_text1};
} }
` `
...@@ -50,8 +50,8 @@ const StyledMenuButton = styled.button` ...@@ -50,8 +50,8 @@ const StyledMenuButton = styled.button`
margin: 0; margin: 0;
padding: 0; padding: 0;
height: 40px; height: 40px;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
border: 1px solid ${({ theme }) => theme.bg0}; border: 1px solid ${({ theme }) => theme.deprecated_bg0};
padding: 0.15rem 0.5rem; padding: 0.15rem 0.5rem;
border-radius: 16px; border-radius: 16px;
...@@ -59,7 +59,7 @@ const StyledMenuButton = styled.button` ...@@ -59,7 +59,7 @@ const StyledMenuButton = styled.button`
:focus { :focus {
cursor: pointer; cursor: pointer;
outline: none; outline: none;
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
} }
svg { svg {
...@@ -68,7 +68,7 @@ const StyledMenuButton = styled.button` ...@@ -68,7 +68,7 @@ const StyledMenuButton = styled.button`
` `
const UNIbutton = styled(ButtonPrimary)` const UNIbutton = styled(ButtonPrimary)`
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
background: radial-gradient(174.47% 188.91% at 1.84% 0%, #ff007a 0%, #2172e5 100%), #edeef2; background: radial-gradient(174.47% 188.91% at 1.84% 0%, #ff007a 0%, #2172e5 100%), #edeef2;
border: none; border: none;
` `
...@@ -86,10 +86,10 @@ const MenuFlyout = styled.span<{ flyoutAlignment?: FlyoutAlignment }>` ...@@ -86,10 +86,10 @@ const MenuFlyout = styled.span<{ flyoutAlignment?: FlyoutAlignment }>`
min-width: 196px; min-width: 196px;
max-height: 350px; max-height: 350px;
overflow: auto; overflow: auto;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04), box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
0px 24px 32px rgba(0, 0, 0, 0.01); 0px 24px 32px rgba(0, 0, 0, 0.01);
border: 1px solid ${({ theme }) => theme.bg0}; border: 1px solid ${({ theme }) => theme.deprecated_bg0};
border-radius: 12px; border-radius: 12px;
padding: 0.5rem; padding: 0.5rem;
display: flex; display: flex;
...@@ -121,9 +121,9 @@ const MenuItem = styled(ExternalLink)` ...@@ -121,9 +121,9 @@ const MenuItem = styled(ExternalLink)`
align-items: center; align-items: center;
padding: 0.5rem 0.5rem; padding: 0.5rem 0.5rem;
justify-content: space-between; justify-content: space-between;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
:hover { :hover {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
} }
...@@ -132,9 +132,9 @@ const MenuItem = styled(ExternalLink)` ...@@ -132,9 +132,9 @@ const MenuItem = styled(ExternalLink)`
const InternalMenuItem = styled(Link)` const InternalMenuItem = styled(Link)`
flex: 1; flex: 1;
padding: 0.5rem 0.5rem; padding: 0.5rem 0.5rem;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
:hover { :hover {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
} }
...@@ -151,7 +151,7 @@ const InternalLinkMenuItem = styled(InternalMenuItem)` ...@@ -151,7 +151,7 @@ const InternalLinkMenuItem = styled(InternalMenuItem)`
justify-content: space-between; justify-content: space-between;
text-decoration: none; text-decoration: none;
:hover { :hover {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
} }
...@@ -170,9 +170,9 @@ const ToggleMenuItem = styled.button` ...@@ -170,9 +170,9 @@ const ToggleMenuItem = styled.button`
justify-content: space-between; justify-content: space-between;
font-size: 1rem; font-size: 1rem;
font-weight: 500; font-weight: 500;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
:hover { :hover {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
} }
......
...@@ -19,7 +19,7 @@ const StyledDialogOverlay = styled(AnimatedDialogOverlay)` ...@@ -19,7 +19,7 @@ const StyledDialogOverlay = styled(AnimatedDialogOverlay)`
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: ${({ theme }) => theme.modalBG}; background-color: ${({ theme }) => theme.deprecated_modalBG};
} }
` `
...@@ -35,8 +35,8 @@ const StyledDialogContent = styled(({ minHeight, maxHeight, mobile, isOpen, ...r ...@@ -35,8 +35,8 @@ const StyledDialogContent = styled(({ minHeight, maxHeight, mobile, isOpen, ...r
&[data-reach-dialog-content] { &[data-reach-dialog-content] {
margin: 0 0 2rem 0; margin: 0 0 2rem 0;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
border: 1px solid ${({ theme }) => theme.bg1}; border: 1px solid ${({ theme }) => theme.deprecated_bg1};
box-shadow: 0 4px 8px 0 ${({ theme }) => transparentize(0.95, theme.shadow1)}; box-shadow: 0 4px 8px 0 ${({ theme }) => transparentize(0.95, theme.shadow1)};
padding: 0px; padding: 0px;
width: 50vw; width: 50vw;
......
...@@ -59,7 +59,7 @@ export function SubmittedView({ ...@@ -59,7 +59,7 @@ export function SubmittedView({
<CloseIcon onClick={onDismiss} /> <CloseIcon onClick={onDismiss} />
</RowBetween> </RowBetween>
<ConfirmedIcon> <ConfirmedIcon>
<ArrowUpCircle strokeWidth={0.5} size={90} color={theme.primary1} /> <ArrowUpCircle strokeWidth={0.5} size={90} color={theme.deprecated_primary1} />
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
{children} {children}
......
...@@ -35,18 +35,18 @@ const StyledNavLink = styled(NavLink).attrs({ ...@@ -35,18 +35,18 @@ const StyledNavLink = styled(NavLink).attrs({
outline: none; outline: none;
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
font-size: 20px; font-size: 20px;
&.${activeClassName} { &.${activeClassName} {
border-radius: 12px; border-radius: 12px;
font-weight: 500; font-weight: 500;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
} }
:hover, :hover,
:focus { :focus {
color: ${({ theme }) => darken(0.1, theme.text1)}; color: ${({ theme }) => darken(0.1, theme.deprecated_text1)};
} }
` `
...@@ -65,7 +65,7 @@ const ActiveText = styled.div` ...@@ -65,7 +65,7 @@ const ActiveText = styled.div`
` `
const StyledArrowLeft = styled(ArrowLeft)` const StyledArrowLeft = styled(ArrowLeft)`
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
` `
export function SwapPoolTabs({ active }: { active: 'swap' | 'pool' }) { export function SwapPoolTabs({ active }: { active: 'swap' | 'pool' }) {
...@@ -134,7 +134,7 @@ export function AddRemoveTabs({ ...@@ -134,7 +134,7 @@ export function AddRemoveTabs({
}} }}
flex={children ? '1' : undefined} flex={children ? '1' : undefined}
> >
<StyledArrowLeft stroke={theme.text2} /> <StyledArrowLeft stroke={theme.deprecated_text2} />
</StyledHistoryLink> </StyledHistoryLink>
<ThemedText.MediumHeader <ThemedText.MediumHeader
fontWeight={500} fontWeight={500}
......
...@@ -4,14 +4,14 @@ import styled from 'styled-components/macro' ...@@ -4,14 +4,14 @@ import styled from 'styled-components/macro'
import { escapeRegExp } from '../../utils' import { escapeRegExp } from '../../utils'
const StyledInput = styled.input<{ error?: boolean; fontSize?: string; align?: string }>` const StyledInput = styled.input<{ error?: boolean; fontSize?: string; align?: string }>`
color: ${({ error, theme }) => (error ? theme.red1 : theme.text1)}; color: ${({ error, theme }) => (error ? theme.deprecated_red1 : theme.deprecated_text1)};
width: 0; width: 0;
position: relative; position: relative;
font-weight: 500; font-weight: 500;
outline: none; outline: none;
border: none; border: none;
flex: 1 1 auto; flex: 1 1 auto;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
font-size: ${({ fontSize }) => fontSize ?? '28px'}; font-size: ${({ fontSize }) => fontSize ?? '28px'};
text-align: ${({ align }) => align && align}; text-align: ${({ align }) => align && align};
white-space: nowrap; white-space: nowrap;
...@@ -35,7 +35,7 @@ const StyledInput = styled.input<{ error?: boolean; fontSize?: string; align?: s ...@@ -35,7 +35,7 @@ const StyledInput = styled.input<{ error?: boolean; fontSize?: string; align?: s
} }
::placeholder { ::placeholder {
color: ${({ theme }) => theme.text4}; color: ${({ theme }) => theme.deprecated_text4};
} }
` `
......
...@@ -10,7 +10,7 @@ const PopoverContainer = styled.div<{ show: boolean }>` ...@@ -10,7 +10,7 @@ const PopoverContainer = styled.div<{ show: boolean }>`
visibility: ${(props) => (props.show ? 'visible' : 'hidden')}; visibility: ${(props) => (props.show ? 'visible' : 'hidden')};
opacity: ${(props) => (props.show ? 1 : 0)}; opacity: ${(props) => (props.show ? 1 : 0)};
transition: visibility 150ms linear, opacity 150ms linear; transition: visibility 150ms linear, opacity 150ms linear;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
` `
const ReferenceElement = styled.div` const ReferenceElement = styled.div`
...@@ -30,9 +30,9 @@ const Arrow = styled.div` ...@@ -30,9 +30,9 @@ const Arrow = styled.div`
z-index: 9998; z-index: 9998;
content: ''; content: '';
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
transform: rotate(45deg); transform: rotate(45deg);
background: ${({ theme }) => theme.bg0}; background: ${({ theme }) => theme.deprecated_bg0};
} }
&.arrow-top { &.arrow-top {
......
...@@ -20,7 +20,7 @@ export default function FailedNetworkSwitchPopup({ chainId }: { chainId: Support ...@@ -20,7 +20,7 @@ export default function FailedNetworkSwitchPopup({ chainId }: { chainId: Support
return ( return (
<RowNoFlex> <RowNoFlex>
<div style={{ paddingRight: 16 }}> <div style={{ paddingRight: 16 }}>
<AlertCircle color={theme.red1} size={24} /> <AlertCircle color={theme.deprecated_red1} size={24} />
</div> </div>
<AutoColumn gap="8px"> <AutoColumn gap="8px">
<ThemedText.Body fontWeight={500}> <ThemedText.Body fontWeight={500}>
......
...@@ -22,7 +22,7 @@ const Popup = styled.div` ...@@ -22,7 +22,7 @@ const Popup = styled.div`
display: inline-block; display: inline-block;
width: 100%; width: 100%;
padding: 1em; padding: 1em;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
position: relative; position: relative;
border-radius: 10px; border-radius: 10px;
padding: 20px; padding: 20px;
...@@ -42,7 +42,7 @@ const Fader = styled.div` ...@@ -42,7 +42,7 @@ const Fader = styled.div`
left: 0px; left: 0px;
width: 100%; width: 100%;
height: 2px; height: 2px;
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
` `
const AnimatedFader = animated(Fader) const AnimatedFader = animated(Fader)
...@@ -90,7 +90,7 @@ export default function PopupItem({ ...@@ -90,7 +90,7 @@ export default function PopupItem({
return ( return (
<Popup> <Popup>
<StyledClose color={theme.text2} onClick={removeThisPopup} /> <StyledClose color={theme.deprecated_text2} onClick={removeThisPopup} />
{popupContent} {popupContent}
{removeAfterMs !== null ? <AnimatedFader style={faderStyle} /> : null} {removeAfterMs !== null ? <AnimatedFader style={faderStyle} /> : null}
</Popup> </Popup>
......
...@@ -19,7 +19,7 @@ const Wrapper = styled(AutoColumn)` ...@@ -19,7 +19,7 @@ const Wrapper = styled(AutoColumn)`
padding: 18px; padding: 18px;
max-width: 360px; max-width: 360px;
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
overflow: hidden; overflow: hidden;
${({ theme }) => theme.mediaWidth.upToSmall` ${({ theme }) => theme.mediaWidth.upToSmall`
...@@ -90,13 +90,18 @@ export default function SurveyPopup() { ...@@ -90,13 +90,18 @@ export default function SurveyPopup() {
<BGOrb src={BGImage} /> <BGOrb src={BGImage} />
<ExternalLink href="https://www.surveymonkey.com/r/YGWV9VD"> <ExternalLink href="https://www.surveymonkey.com/r/YGWV9VD">
<RowFixed> <RowFixed>
<MessageCircle stroke={theme.black} size="20px" strokeWidth="1px" /> <MessageCircle stroke={theme.deprecated_black} size="20px" strokeWidth="1px" />
<ThemedText.White fontWeight={600} color={theme.black} ml="6px"> <ThemedText.White fontWeight={600} color={theme.deprecated_black} ml="6px">
<Trans>Tell us what you think ↗</Trans> <Trans>Tell us what you think ↗</Trans>
</ThemedText.White> </ThemedText.White>
</RowFixed> </RowFixed>
</ExternalLink> </ExternalLink>
<ThemedText.Black style={{ zIndex: Z_INDEX.fixed }} fontWeight={400} fontSize="12px" color={theme.black}> <ThemedText.Black
style={{ zIndex: Z_INDEX.fixed }}
fontWeight={400}
fontSize="12px"
color={theme.deprecated_black}
>
<Trans>Take a 10 minute survey to help us improve your experience in the Uniswap app.</Trans> <Trans>Take a 10 minute survey to help us improve your experience in the Uniswap app.</Trans>
</ThemedText.Black> </ThemedText.Black>
</Wrapper> </Wrapper>
......
...@@ -27,7 +27,11 @@ export default function TransactionPopup({ hash }: { hash: string }) { ...@@ -27,7 +27,11 @@ export default function TransactionPopup({ hash }: { hash: string }) {
return ( return (
<RowNoFlex> <RowNoFlex>
<div style={{ paddingRight: 16 }}> <div style={{ paddingRight: 16 }}>
{success ? <CheckCircle color={theme.green1} size={24} /> : <AlertCircle color={theme.red1} size={24} />} {success ? (
<CheckCircle color={theme.deprecated_green1} size={24} />
) : (
<AlertCircle color={theme.deprecated_red1} size={24} />
)}
</div> </div>
<AutoColumn gap="8px"> <AutoColumn gap="8px">
<ThemedText.Body fontWeight={500}> <ThemedText.Body fontWeight={500}>
......
...@@ -20,7 +20,7 @@ import { FixedHeightRow } from '.' ...@@ -20,7 +20,7 @@ import { FixedHeightRow } from '.'
const StyledPositionCard = styled(LightCard)<{ bgColor: any }>` const StyledPositionCard = styled(LightCard)<{ bgColor: any }>`
border: none; border: none;
background: ${({ theme, bgColor }) => background: ${({ theme, bgColor }) =>
`radial-gradient(91.85% 100% at 1.84% 0%, ${transparentize(0.8, bgColor)} 0%, ${theme.bg3} 100%) `}; `radial-gradient(91.85% 100% at 1.84% 0%, ${transparentize(0.8, bgColor)} 0%, ${theme.deprecated_bg3} 100%) `};
position: relative; position: relative;
overflow: hidden; overflow: hidden;
` `
......
...@@ -29,7 +29,7 @@ import { FixedHeightRow } from '.' ...@@ -29,7 +29,7 @@ import { FixedHeightRow } from '.'
const StyledPositionCard = styled(LightCard)<{ bgColor: any }>` const StyledPositionCard = styled(LightCard)<{ bgColor: any }>`
border: none; border: none;
background: ${({ theme, bgColor }) => background: ${({ theme, bgColor }) =>
`radial-gradient(91.85% 100% at 1.84% 0%, ${transparentize(0.8, bgColor)} 0%, ${theme.bg3} 100%) `}; `radial-gradient(91.85% 100% at 1.84% 0%, ${transparentize(0.8, bgColor)} 0%, ${theme.deprecated_bg3} 100%) `};
position: relative; position: relative;
overflow: hidden; overflow: hidden;
` `
......
...@@ -33,7 +33,7 @@ export const FixedHeightRow = styled(RowBetween)` ...@@ -33,7 +33,7 @@ export const FixedHeightRow = styled(RowBetween)`
const StyledPositionCard = styled(LightCard)<{ bgColor: any }>` const StyledPositionCard = styled(LightCard)<{ bgColor: any }>`
border: none; border: none;
background: ${({ theme, bgColor }) => background: ${({ theme, bgColor }) =>
`radial-gradient(91.85% 100% at 1.84% 0%, ${transparentize(0.8, bgColor)} 0%, ${theme.bg3} 100%) `}; `radial-gradient(91.85% 100% at 1.84% 0%, ${transparentize(0.8, bgColor)} 0%, ${theme.deprecated_bg3} 100%) `};
position: relative; position: relative;
overflow: hidden; overflow: hidden;
` `
......
...@@ -31,12 +31,12 @@ const LinkRow = styled(Link)` ...@@ -31,12 +31,12 @@ const LinkRow = styled(Link)`
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
margin: 8px 0; margin: 8px 0;
padding: 16px; padding: 16px;
text-decoration: none; text-decoration: none;
font-weight: 500; font-weight: 500;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
&:last-of-type { &:last-of-type {
margin: 8px 0 0 0; margin: 8px 0 0 0;
...@@ -45,7 +45,7 @@ const LinkRow = styled(Link)` ...@@ -45,7 +45,7 @@ const LinkRow = styled(Link)`
text-align: center; text-align: center;
} }
:hover { :hover {
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
} }
@media screen and (min-width: ${MEDIA_WIDTHS.upToSmall}px) { @media screen and (min-width: ${MEDIA_WIDTHS.upToSmall}px) {
...@@ -79,7 +79,7 @@ const RangeLineItem = styled(DataLineItem)` ...@@ -79,7 +79,7 @@ const RangeLineItem = styled(DataLineItem)`
width: 100%; width: 100%;
${({ theme }) => theme.mediaWidth.upToSmall` ${({ theme }) => theme.mediaWidth.upToSmall`
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
border-radius: 12px; border-radius: 12px;
padding: 8px 0; padding: 8px 0;
`}; `};
...@@ -87,7 +87,7 @@ const RangeLineItem = styled(DataLineItem)` ...@@ -87,7 +87,7 @@ const RangeLineItem = styled(DataLineItem)`
const DoubleArrow = styled.span` const DoubleArrow = styled.span`
margin: 0 2px; margin: 0 2px;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
${({ theme }) => theme.mediaWidth.upToSmall` ${({ theme }) => theme.mediaWidth.upToSmall`
margin: 4px; margin: 4px;
padding: 20px; padding: 20px;
...@@ -95,13 +95,13 @@ const DoubleArrow = styled.span` ...@@ -95,13 +95,13 @@ const DoubleArrow = styled.span`
` `
const RangeText = styled.span` const RangeText = styled.span`
/* background-color: ${({ theme }) => theme.bg2}; */ /* background-color: ${({ theme }) => theme.deprecated_bg2}; */
padding: 0.25rem 0.5rem; padding: 0.25rem 0.5rem;
border-radius: 8px; border-radius: 8px;
` `
const ExtentsText = styled.span` const ExtentsText = styled.span`
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
font-size: 14px; font-size: 14px;
margin-right: 4px; margin-right: 4px;
${({ theme }) => theme.mediaWidth.upToSmall` ${({ theme }) => theme.mediaWidth.upToSmall`
......
...@@ -135,7 +135,7 @@ export const PositionPreview = ({ ...@@ -135,7 +135,7 @@ export const PositionPreview = ({
{quoteCurrency.symbol} per {baseCurrency.symbol} {quoteCurrency.symbol} per {baseCurrency.symbol}
</Trans> </Trans>
</ThemedText.Main> </ThemedText.Main>
<ThemedText.Small textAlign="center" color={theme.text3} style={{ marginTop: '4px' }}> <ThemedText.Small textAlign="center" color={theme.deprecated_text3} style={{ marginTop: '4px' }}>
<Trans>Your position will be 100% composed of {baseCurrency?.symbol} at this price</Trans> <Trans>Your position will be 100% composed of {baseCurrency?.symbol} at this price</Trans>
</ThemedText.Small> </ThemedText.Small>
</AutoColumn> </AutoColumn>
...@@ -156,7 +156,7 @@ export const PositionPreview = ({ ...@@ -156,7 +156,7 @@ export const PositionPreview = ({
{quoteCurrency.symbol} per {baseCurrency.symbol} {quoteCurrency.symbol} per {baseCurrency.symbol}
</Trans> </Trans>
</ThemedText.Main> </ThemedText.Main>
<ThemedText.Small textAlign="center" color={theme.text3} style={{ marginTop: '4px' }}> <ThemedText.Small textAlign="center" color={theme.deprecated_text3} style={{ marginTop: '4px' }}>
<Trans>Your position will be 100% composed of {quoteCurrency?.symbol} at this price</Trans> <Trans>Your position will be 100% composed of {quoteCurrency?.symbol} at this price</Trans>
</ThemedText.Small> </ThemedText.Small>
</AutoColumn> </AutoColumn>
......
...@@ -20,20 +20,20 @@ const Wrapper = styled.div` ...@@ -20,20 +20,20 @@ const Wrapper = styled.div`
` `
const StyledExternalCard = styled(Card)` const StyledExternalCard = styled(Card)`
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
padding: 0.5rem; padding: 0.5rem;
width: 100%; width: 100%;
:hover, :hover,
:focus, :focus,
:active { :active {
background-color: ${({ theme }) => theme.primary4}; background-color: ${({ theme }) => theme.deprecated_primary4};
} }
` `
const HoverText = styled.div` const HoverText = styled.div`
text-decoration: none; text-decoration: none;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -128,7 +128,7 @@ export function PrivacyPolicy() { ...@@ -128,7 +128,7 @@ export function PrivacyPolicy() {
<RowBetween> <RowBetween>
<AutoRow gap="4px"> <AutoRow gap="4px">
<Info size={20} /> <Info size={20} />
<ThemedText.Main fontSize={14} color={'primaryText1'}> <ThemedText.Main fontSize={14} color={'deprecated_primaryText1'}>
<Trans>Uniswap Labs&apos; Terms of Service</Trans> <Trans>Uniswap Labs&apos; Terms of Service</Trans>
</ThemedText.Main> </ThemedText.Main>
</AutoRow> </AutoRow>
...@@ -141,7 +141,7 @@ export function PrivacyPolicy() { ...@@ -141,7 +141,7 @@ export function PrivacyPolicy() {
<RowBetween> <RowBetween>
<AutoRow gap="4px"> <AutoRow gap="4px">
<Info size={20} /> <Info size={20} />
<ThemedText.Main fontSize={14} color={'primaryText1'}> <ThemedText.Main fontSize={14} color={'deprecated_primaryText1'}>
<Trans>Protocol Disclaimer</Trans> <Trans>Protocol Disclaimer</Trans>
</ThemedText.Main> </ThemedText.Main>
</AutoRow> </AutoRow>
...@@ -159,7 +159,7 @@ export function PrivacyPolicy() { ...@@ -159,7 +159,7 @@ export function PrivacyPolicy() {
<AutoColumn gap="8px"> <AutoColumn gap="8px">
<AutoRow gap="4px"> <AutoRow gap="4px">
<Info size={18} /> <Info size={18} />
<ThemedText.Main fontSize={14} color={'text1'}> <ThemedText.Main fontSize={14} color={'deprecated_text1'}>
{name} {name}
</ThemedText.Main> </ThemedText.Main>
</AutoRow> </AutoRow>
......
...@@ -13,7 +13,7 @@ const Wrapper = styled(AutoColumn)` ...@@ -13,7 +13,7 @@ const Wrapper = styled(AutoColumn)`
const Grouping = styled(AutoColumn)` const Grouping = styled(AutoColumn)`
width: fit-content; width: fit-content;
padding: 4px; padding: 4px;
/* background-color: ${({ theme }) => theme.bg2}; */ /* background-color: ${({ theme }) => theme.deprecated_bg2}; */
border-radius: 16px; border-radius: 16px;
` `
...@@ -21,9 +21,9 @@ const Circle = styled.div<{ confirmed?: boolean; disabled?: boolean }>` ...@@ -21,9 +21,9 @@ const Circle = styled.div<{ confirmed?: boolean; disabled?: boolean }>`
width: 48px; width: 48px;
height: 48px; height: 48px;
background-color: ${({ theme, confirmed, disabled }) => background-color: ${({ theme, confirmed, disabled }) =>
disabled ? theme.bg3 : confirmed ? theme.green1 : theme.primary1}; disabled ? theme.deprecated_bg3 : confirmed ? theme.deprecated_green1 : theme.deprecated_primary1};
border-radius: 50%; border-radius: 50%;
color: ${({ theme, disabled }) => (disabled ? theme.text3 : theme.text1)}; color: ${({ theme, disabled }) => (disabled ? theme.deprecated_text3 : theme.deprecated_text1)};
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -65,7 +65,7 @@ export default function ProgressCircles({ steps, disabled = false, ...rest }: Pr ...@@ -65,7 +65,7 @@ export default function ProgressCircles({ steps, disabled = false, ...rest }: Pr
<Circle confirmed={step} disabled={disabled || (!steps[i - 1] && i !== 0)}> <Circle confirmed={step} disabled={disabled || (!steps[i - 1] && i !== 0)}>
{step ? '' : i + 1 + '.'} {step ? '' : i + 1 + '.'}
</Circle> </Circle>
<ThemedText.Main color={theme.text4}>|</ThemedText.Main> <ThemedText.Main color={theme.deprecated_text4}>|</ThemedText.Main>
</CircleRow> </CircleRow>
) )
})} })}
......
...@@ -16,8 +16,8 @@ const QuestionWrapper = styled.div` ...@@ -16,8 +16,8 @@ const QuestionWrapper = styled.div`
cursor: default; cursor: default;
border-radius: 36px; border-radius: 36px;
font-size: 12px; font-size: 12px;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
:hover, :hover,
:focus { :focus {
......
...@@ -10,7 +10,7 @@ const Button = styled(ButtonOutlined).attrs(() => ({ ...@@ -10,7 +10,7 @@ const Button = styled(ButtonOutlined).attrs(() => ({
padding: '8px', padding: '8px',
$borderRadius: '8px', $borderRadius: '8px',
}))` }))`
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
flex: 1; flex: 1;
` `
......
...@@ -48,12 +48,12 @@ const DottedLine = styled.div` ...@@ -48,12 +48,12 @@ const DottedLine = styled.div`
const DotColor = styled(DotLine)` const DotColor = styled(DotLine)`
path { path {
stroke: ${({ theme }) => theme.bg4}; stroke: ${({ theme }) => theme.deprecated_bg4};
} }
` `
const OpaqueBadge = styled(Badge)` const OpaqueBadge = styled(Badge)`
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
border-radius: 8px; border-radius: 8px;
display: grid; display: grid;
font-size: 12px; font-size: 12px;
...@@ -65,9 +65,9 @@ const OpaqueBadge = styled(Badge)` ...@@ -65,9 +65,9 @@ const OpaqueBadge = styled(Badge)`
` `
const ProtocolBadge = styled(Badge)` const ProtocolBadge = styled(Badge)`
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
border-radius: 4px; border-radius: 4px;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 10px; font-size: 10px;
padding: 2px 4px; padding: 2px 4px;
z-index: ${Z_INDEX.sticky + 1}; z-index: ${Z_INDEX.sticky + 1};
......
...@@ -37,7 +37,7 @@ const Header = styled.div` ...@@ -37,7 +37,7 @@ const Header = styled.div`
width: 100%; width: 100%;
` `
const Icon = styled(AlertCircle)` const Icon = styled(AlertCircle)`
stroke: ${({ theme }) => theme.text2}; stroke: ${({ theme }) => theme.deprecated_text2};
width: 48px; width: 48px;
height: 48px; height: 48px;
` `
......
...@@ -17,7 +17,7 @@ const MobileWrapper = styled(AutoColumn)` ...@@ -17,7 +17,7 @@ const MobileWrapper = styled(AutoColumn)`
` `
const BaseWrapper = styled.div<{ disable?: boolean }>` const BaseWrapper = styled.div<{ disable?: boolean }>`
border: 1px solid ${({ theme, disable }) => (disable ? 'transparent' : theme.bg3)}; border: 1px solid ${({ theme, disable }) => (disable ? 'transparent' : theme.deprecated_bg3)};
border-radius: 10px; border-radius: 10px;
display: flex; display: flex;
padding: 6px; padding: 6px;
...@@ -25,11 +25,11 @@ const BaseWrapper = styled.div<{ disable?: boolean }>` ...@@ -25,11 +25,11 @@ const BaseWrapper = styled.div<{ disable?: boolean }>`
align-items: center; align-items: center;
:hover { :hover {
cursor: ${({ disable }) => !disable && 'pointer'}; cursor: ${({ disable }) => !disable && 'pointer'};
background-color: ${({ theme, disable }) => !disable && theme.bg2}; background-color: ${({ theme, disable }) => !disable && theme.deprecated_bg2};
} }
color: ${({ theme, disable }) => disable && theme.text3}; color: ${({ theme, disable }) => disable && theme.deprecated_text3};
background-color: ${({ theme, disable }) => disable && theme.bg3}; background-color: ${({ theme, disable }) => disable && theme.deprecated_bg3};
filter: ${({ disable }) => disable && 'grayscale(1)'}; filter: ${({ disable }) => disable && 'grayscale(1)'};
` `
......
...@@ -86,7 +86,7 @@ exports[`renders currency rows correctly when currencies list is non-empty 1`] = ...@@ -86,7 +86,7 @@ exports[`renders currency rows correctly when currencies list is non-empty 1`] =
DAI DAI
</div> </div>
<div <div
class="c5 css-165qfk5" class="c5 css-1j6a53a"
> >
Dai Stablecoin Dai Stablecoin
</div> </div>
...@@ -109,7 +109,7 @@ exports[`renders currency rows correctly when currencies list is non-empty 1`] = ...@@ -109,7 +109,7 @@ exports[`renders currency rows correctly when currencies list is non-empty 1`] =
USDC USDC
</div> </div>
<div <div
class="c5 css-165qfk5" class="c5 css-1j6a53a"
> >
USD//C USD//C
</div> </div>
...@@ -132,7 +132,7 @@ exports[`renders currency rows correctly when currencies list is non-empty 1`] = ...@@ -132,7 +132,7 @@ exports[`renders currency rows correctly when currencies list is non-empty 1`] =
WBTC WBTC
</div> </div>
<div <div
class="c5 css-165qfk5" class="c5 css-1j6a53a"
> >
Wrapped BTC Wrapped BTC
</div> </div>
......
...@@ -38,8 +38,8 @@ const StyledBalanceText = styled(Text)` ...@@ -38,8 +38,8 @@ const StyledBalanceText = styled(Text)`
` `
const Tag = styled.div` const Tag = styled.div`
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 14px; font-size: 14px;
border-radius: 4px; border-radius: 4px;
padding: 0.25rem 0.3rem 0.25rem 0.3rem; padding: 0.25rem 0.3rem 0.25rem 0.3rem;
...@@ -180,7 +180,7 @@ function BreakLineComponent({ style }: { style: CSSProperties }) { ...@@ -180,7 +180,7 @@ function BreakLineComponent({ style }: { style: CSSProperties }) {
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
<TokenListLogoWrapper src={TokenListLogo} /> <TokenListLogoWrapper src={TokenListLogo} />
<ThemedText.Main ml="6px" fontSize="12px" color={theme.text1}> <ThemedText.Main ml="6px" fontSize="12px" color={theme.deprecated_text1}>
<Trans>Expanded results from inactive Token Lists</Trans> <Trans>Expanded results from inactive Token Lists</Trans>
</ThemedText.Main> </ThemedText.Main>
</RowFixed> </RowFixed>
......
...@@ -42,8 +42,8 @@ const Footer = styled.div` ...@@ -42,8 +42,8 @@ const Footer = styled.div`
padding: 20px; padding: 20px;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
border-top: 1px solid ${({ theme }) => theme.bg2}; border-top: 1px solid ${({ theme }) => theme.deprecated_bg2};
` `
interface CurrencySearchProps { interface CurrencySearchProps {
...@@ -251,19 +251,19 @@ export function CurrencySearch({ ...@@ -251,19 +251,19 @@ export function CurrencySearch({
</div> </div>
) : ( ) : (
<Column style={{ padding: '20px', height: '100%' }}> <Column style={{ padding: '20px', height: '100%' }}>
<ThemedText.Main color={theme.text3} textAlign="center" mb="20px"> <ThemedText.Main color={theme.deprecated_text3} textAlign="center" mb="20px">
<Trans>No results found.</Trans> <Trans>No results found.</Trans>
</ThemedText.Main> </ThemedText.Main>
</Column> </Column>
)} )}
<Footer> <Footer>
<Row justify="center"> <Row justify="center">
<ButtonText onClick={showManageView} color={theme.primary1} className="list-token-manage-button"> <ButtonText onClick={showManageView} color={theme.deprecated_primary1} className="list-token-manage-button">
<RowFixed> <RowFixed>
<IconWrapper size="16px" marginRight="6px" stroke={theme.primaryText1}> <IconWrapper size="16px" marginRight="6px" stroke={theme.deprecated_primaryText1}>
<Edit /> <Edit />
</IconWrapper> </IconWrapper>
<ThemedText.Main color={theme.primaryText1}> <ThemedText.Main color={theme.deprecated_primaryText1}>
<Trans>Manage Token Lists</Trans> <Trans>Manage Token Lists</Trans>
</ThemedText.Main> </ThemedText.Main>
</RowFixed> </RowFixed>
......
...@@ -90,7 +90,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro ...@@ -90,7 +90,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro
<SectionBreak /> <SectionBreak />
<PaddedColumn gap="md"> <PaddedColumn gap="md">
<AutoColumn gap="md"> <AutoColumn gap="md">
<Card backgroundColor={theme.bg2} padding="12px 20px"> <Card backgroundColor={theme.deprecated_bg2} padding="12px 20px">
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
{list.logoURI && <ListLogo logoURI={list.logoURI} size="40px" />} {list.logoURI && <ListLogo logoURI={list.logoURI} size="40px" />}
...@@ -105,7 +105,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro ...@@ -105,7 +105,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro
</ThemedText.Main> </ThemedText.Main>
</RowFixed> </RowFixed>
<ExternalLink href={`https://tokenlists.org/token-list?url=${listURL}`}> <ExternalLink href={`https://tokenlists.org/token-list?url=${listURL}`}>
<ThemedText.Main fontSize={'12px'} color={theme.blue1}> <ThemedText.Main fontSize={'12px'} color={theme.deprecated_blue1}>
{listURL} {listURL}
</ThemedText.Main> </ThemedText.Main>
</ExternalLink> </ExternalLink>
...@@ -113,23 +113,23 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro ...@@ -113,23 +113,23 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro
</RowFixed> </RowFixed>
</RowBetween> </RowBetween>
</Card> </Card>
<Card style={{ backgroundColor: transparentize(0.8, theme.red1) }}> <Card style={{ backgroundColor: transparentize(0.8, theme.deprecated_red1) }}>
<AutoColumn justify="center" style={{ textAlign: 'center', gap: '16px', marginBottom: '12px' }}> <AutoColumn justify="center" style={{ textAlign: 'center', gap: '16px', marginBottom: '12px' }}>
<AlertTriangle stroke={theme.red1} size={32} /> <AlertTriangle stroke={theme.deprecated_red1} size={32} />
<ThemedText.Body fontWeight={500} fontSize={20} color={theme.red1}> <ThemedText.Body fontWeight={500} fontSize={20} color={theme.deprecated_red1}>
<Trans>Import at your own risk</Trans> <Trans>Import at your own risk</Trans>
</ThemedText.Body> </ThemedText.Body>
</AutoColumn> </AutoColumn>
<AutoColumn style={{ textAlign: 'center', gap: '16px', marginBottom: '12px' }}> <AutoColumn style={{ textAlign: 'center', gap: '16px', marginBottom: '12px' }}>
<ThemedText.Body fontWeight={500} color={theme.red1}> <ThemedText.Body fontWeight={500} color={theme.deprecated_red1}>
<Trans> <Trans>
By adding this list you are implicitly trusting that the data is correct. Anyone can create a list, By adding this list you are implicitly trusting that the data is correct. Anyone can create a list,
including creating fake versions of existing lists and lists that claim to represent projects that do including creating fake versions of existing lists and lists that claim to represent projects that do
not have one. not have one.
</Trans> </Trans>
</ThemedText.Body> </ThemedText.Body>
<ThemedText.Body fontWeight={600} color={theme.red1}> <ThemedText.Body fontWeight={600} color={theme.deprecated_red1}>
<Trans>If you purchase a token from this list, you may not be able to sell it back.</Trans> <Trans>If you purchase a token from this list, you may not be able to sell it back.</Trans>
</ThemedText.Body> </ThemedText.Body>
</AutoColumn> </AutoColumn>
...@@ -140,7 +140,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro ...@@ -140,7 +140,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro
checked={confirmed} checked={confirmed}
onChange={() => setConfirmed(!confirmed)} onChange={() => setConfirmed(!confirmed)}
/> />
<ThemedText.Body ml="10px" fontSize="16px" color={theme.red1} fontWeight={500}> <ThemedText.Body ml="10px" fontSize="16px" color={theme.deprecated_red1} fontWeight={500}>
<Trans>I understand</Trans> <Trans>I understand</Trans>
</ThemedText.Body> </ThemedText.Body>
</AutoRow> </AutoRow>
......
...@@ -29,7 +29,7 @@ const CheckIcon = styled(CheckCircle)` ...@@ -29,7 +29,7 @@ const CheckIcon = styled(CheckCircle)`
height: 16px; height: 16px;
width: 16px; width: 16px;
margin-right: 6px; margin-right: 6px;
stroke: ${({ theme }) => theme.green1}; stroke: ${({ theme }) => theme.deprecated_green1};
` `
const NameOverflow = styled.div` const NameOverflow = styled.div`
...@@ -74,7 +74,7 @@ export default function ImportRow({ ...@@ -74,7 +74,7 @@ export default function ImportRow({
</AutoRow> </AutoRow>
{list && list.logoURI && ( {list && list.logoURI && (
<RowFixed> <RowFixed>
<ThemedText.Small mr="4px" color={theme.text3}> <ThemedText.Small mr="4px" color={theme.deprecated_text3}>
<Trans>via {list.name} </Trans> <Trans>via {list.name} </Trans>
</ThemedText.Small> </ThemedText.Small>
<ListLogo logoURI={list.logoURI} size="12px" /> <ListLogo logoURI={list.logoURI} size="12px" />
...@@ -97,7 +97,7 @@ export default function ImportRow({ ...@@ -97,7 +97,7 @@ export default function ImportRow({
) : ( ) : (
<RowFixed style={{ minWidth: 'fit-content' }}> <RowFixed style={{ minWidth: 'fit-content' }}>
<CheckIcon /> <CheckIcon />
<ThemedText.Main color={theme.green1}> <ThemedText.Main color={theme.deprecated_green1}>
<Trans>Active</Trans> <Trans>Active</Trans>
</ThemedText.Main> </ThemedText.Main>
</RowFixed> </RowFixed>
......
...@@ -65,7 +65,7 @@ export function ImportToken(props: ImportProps) { ...@@ -65,7 +65,7 @@ export function ImportToken(props: ImportProps) {
<SectionBreak /> <SectionBreak />
<AutoColumn gap="md" style={{ marginBottom: '32px', padding: '1rem' }}> <AutoColumn gap="md" style={{ marginBottom: '32px', padding: '1rem' }}>
<AutoColumn justify="center" style={{ textAlign: 'center', gap: '16px', padding: '1rem' }}> <AutoColumn justify="center" style={{ textAlign: 'center', gap: '16px', padding: '1rem' }}>
<AlertCircle size={48} stroke={theme.text2} strokeWidth={1} /> <AlertCircle size={48} stroke={theme.deprecated_text2} strokeWidth={1} />
<ThemedText.Body fontWeight={400} fontSize={16}> <ThemedText.Body fontWeight={400} fontSize={16}>
<Trans> <Trans>
This token doesn&apos;t appear on the active token list(s). Make sure this is the token that you want to This token doesn&apos;t appear on the active token list(s). Make sure this is the token that you want to
......
...@@ -21,7 +21,7 @@ const Wrapper = styled.div` ...@@ -21,7 +21,7 @@ const Wrapper = styled.div`
` `
const ToggleWrapper = styled(RowBetween)` const ToggleWrapper = styled(RowBetween)`
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
border-radius: 12px; border-radius: 12px;
padding: 6px; padding: 6px;
` `
...@@ -34,8 +34,8 @@ const ToggleOption = styled.div<{ active?: boolean }>` ...@@ -34,8 +34,8 @@ const ToggleOption = styled.div<{ active?: boolean }>`
justify-content: center; justify-content: center;
border-radius: 12px; border-radius: 12px;
font-weight: 600; font-weight: 600;
background-color: ${({ theme, active }) => (active ? theme.bg1 : theme.bg3)}; background-color: ${({ theme, active }) => (active ? theme.deprecated_bg1 : theme.deprecated_bg3)};
color: ${({ theme, active }) => (active ? theme.text1 : theme.text2)}; color: ${({ theme, active }) => (active ? theme.deprecated_text1 : theme.deprecated_text2)};
user-select: none; user-select: none;
:hover { :hover {
......
...@@ -46,11 +46,11 @@ const PopoverContainer = styled.div<{ show: boolean }>` ...@@ -46,11 +46,11 @@ const PopoverContainer = styled.div<{ show: boolean }>`
visibility: ${(props) => (props.show ? 'visible' : 'hidden')}; visibility: ${(props) => (props.show ? 'visible' : 'hidden')};
opacity: ${(props) => (props.show ? 1 : 0)}; opacity: ${(props) => (props.show ? 1 : 0)};
transition: visibility 150ms linear, opacity 150ms linear; transition: visibility 150ms linear, opacity 150ms linear;
background: ${({ theme }) => theme.bg2}; background: ${({ theme }) => theme.deprecated_bg2};
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04), box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
0px 24px 32px rgba(0, 0, 0, 0.01); 0px 24px 32px rgba(0, 0, 0, 0.01);
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
border-radius: 0.5rem; border-radius: 0.5rem;
padding: 1rem; padding: 1rem;
display: grid; display: grid;
...@@ -73,16 +73,16 @@ const StyledTitleText = styled.div<{ active: boolean }>` ...@@ -73,16 +73,16 @@ const StyledTitleText = styled.div<{ active: boolean }>`
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: 600; font-weight: 600;
color: ${({ theme, active }) => (active ? theme.white : theme.text2)}; color: ${({ theme, active }) => (active ? theme.deprecated_white : theme.deprecated_text2)};
` `
const StyledListUrlText = styled(ThemedText.Main)<{ active: boolean }>` const StyledListUrlText = styled(ThemedText.Main)<{ active: boolean }>`
font-size: 12px; font-size: 12px;
color: ${({ theme, active }) => (active ? theme.white : theme.text2)}; color: ${({ theme, active }) => (active ? theme.deprecated_white : theme.deprecated_text2)};
` `
const RowWrapper = styled(Row)<{ bgColor: string; active: boolean; hasActiveTokens: boolean }>` const RowWrapper = styled(Row)<{ bgColor: string; active: boolean; hasActiveTokens: boolean }>`
background-color: ${({ bgColor, active, theme }) => (active ? bgColor ?? 'transparent' : theme.bg2)}; background-color: ${({ bgColor, active, theme }) => (active ? bgColor ?? 'transparent' : theme.deprecated_bg2)};
opacity: ${({ hasActiveTokens }) => (hasActiveTokens ? 1 : 0.4)}; opacity: ${({ hasActiveTokens }) => (hasActiveTokens ? 1 : 0.4)};
transition: 200ms; transition: 200ms;
align-items: center; align-items: center;
...@@ -193,7 +193,7 @@ const ListRow = memo(function ListRow({ listUrl }: { listUrl: string }) { ...@@ -193,7 +193,7 @@ const ListRow = memo(function ListRow({ listUrl }: { listUrl: string }) {
</StyledListUrlText> </StyledListUrlText>
<StyledMenu ref={node as any}> <StyledMenu ref={node as any}>
<ButtonEmpty onClick={toggle} ref={setReferenceElement} padding="0"> <ButtonEmpty onClick={toggle} ref={setReferenceElement} padding="0">
<Settings stroke={isActive ? theme.bg1 : theme.text1} size={12} /> <Settings stroke={isActive ? theme.deprecated_bg1 : theme.deprecated_text1} size={12} />
</ButtonEmpty> </ButtonEmpty>
{open && ( {open && (
<PopoverContainer show={true} ref={setPopperElement as any} style={styles.popper} {...attributes.popper}> <PopoverContainer show={true} ref={setPopperElement as any} style={styles.popper} {...attributes.popper}>
...@@ -369,7 +369,7 @@ export function ManageLists({ ...@@ -369,7 +369,7 @@ export function ManageLists({
</PaddedColumn> </PaddedColumn>
{tempList && ( {tempList && (
<PaddedColumn style={{ paddingTop: 0 }}> <PaddedColumn style={{ paddingTop: 0 }}>
<Card backgroundColor={theme.bg2} padding="12px 20px"> <Card backgroundColor={theme.deprecated_bg2} padding="12px 20px">
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
{tempList.logoURI && <ListLogo logoURI={tempList.logoURI} size="40px" />} {tempList.logoURI && <ListLogo logoURI={tempList.logoURI} size="40px" />}
...@@ -382,10 +382,10 @@ export function ManageLists({ ...@@ -382,10 +382,10 @@ export function ManageLists({
</RowFixed> </RowFixed>
{isImported ? ( {isImported ? (
<RowFixed> <RowFixed>
<IconWrapper stroke={theme.text2} size="16px" marginRight={'10px'}> <IconWrapper stroke={theme.deprecated_text2} size="16px" marginRight={'10px'}>
<CheckCircle /> <CheckCircle />
</IconWrapper> </IconWrapper>
<ThemedText.Body color={theme.text2}> <ThemedText.Body color={theme.deprecated_text2}>
<Trans>Loaded</Trans> <Trans>Loaded</Trans>
</ThemedText.Body> </ThemedText.Body>
</RowFixed> </RowFixed>
......
...@@ -32,7 +32,7 @@ const Footer = styled.div` ...@@ -32,7 +32,7 @@ const Footer = styled.div`
border-radius: 20px; border-radius: 20px;
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top: 1px solid ${({ theme }) => theme.bg3}; border-top: 1px solid ${({ theme }) => theme.deprecated_bg3};
padding: 20px; padding: 20px;
text-align: center; text-align: center;
` `
...@@ -116,7 +116,7 @@ export default function ManageTokens({ ...@@ -116,7 +116,7 @@ export default function ManageTokens({
</ThemedText.Error> </ThemedText.Error>
)} )}
{searchToken && ( {searchToken && (
<Card backgroundColor={theme.bg2} padding="10px 0"> <Card backgroundColor={theme.deprecated_bg2} padding="10px 0">
<ImportRow <ImportRow
token={searchToken} token={searchToken}
showImportView={() => setModalView(CurrencyModalView.importToken)} showImportView={() => setModalView(CurrencyModalView.importToken)}
......
...@@ -15,7 +15,7 @@ import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink' ...@@ -15,7 +15,7 @@ import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
const WarningWrapper = styled(Card)<{ highWarning: boolean }>` const WarningWrapper = styled(Card)<{ highWarning: boolean }>`
background-color: ${({ theme, highWarning }) => background-color: ${({ theme, highWarning }) =>
highWarning ? transparentize(0.8, theme.red1) : transparentize(0.8, theme.yellow2)}; highWarning ? transparentize(0.8, theme.deprecated_red1) : transparentize(0.8, theme.deprecated_yellow2)};
width: fit-content; width: fit-content;
` `
...@@ -35,7 +35,7 @@ const TokenImportCard = ({ list, token }: TokenImportCardProps) => { ...@@ -35,7 +35,7 @@ const TokenImportCard = ({ list, token }: TokenImportCardProps) => {
const theme = useTheme() const theme = useTheme()
const { chainId } = useWeb3React() const { chainId } = useWeb3React()
return ( return (
<Card backgroundColor={theme.bg2} padding="2rem"> <Card backgroundColor={theme.deprecated_bg2} padding="2rem">
<AutoColumn gap="10px" justify="center"> <AutoColumn gap="10px" justify="center">
<CurrencyLogo currency={token} size={'32px'} /> <CurrencyLogo currency={token} size={'32px'} />
<AutoColumn gap="4px" justify="center"> <AutoColumn gap="4px" justify="center">
...@@ -54,15 +54,15 @@ const TokenImportCard = ({ list, token }: TokenImportCardProps) => { ...@@ -54,15 +54,15 @@ const TokenImportCard = ({ list, token }: TokenImportCardProps) => {
{list !== undefined ? ( {list !== undefined ? (
<RowFixed> <RowFixed>
{list.logoURI && <ListLogo logoURI={list.logoURI} size="16px" />} {list.logoURI && <ListLogo logoURI={list.logoURI} size="16px" />}
<ThemedText.Small ml="6px" fontSize={14} color={theme.text3}> <ThemedText.Small ml="6px" fontSize={14} color={theme.deprecated_text3}>
<Trans>via {list.name} token list</Trans> <Trans>via {list.name} token list</Trans>
</ThemedText.Small> </ThemedText.Small>
</RowFixed> </RowFixed>
) : ( ) : (
<WarningWrapper $borderRadius="4px" padding="4px" highWarning={true}> <WarningWrapper $borderRadius="4px" padding="4px" highWarning={true}>
<RowFixed> <RowFixed>
<AlertCircle stroke={theme.red1} size="10px" /> <AlertCircle stroke={theme.deprecated_red1} size="10px" />
<ThemedText.Body color={theme.red1} ml="4px" fontSize="10px" fontWeight={500}> <ThemedText.Body color={theme.deprecated_red1} ml="4px" fontSize="10px" fontWeight={500}>
<Trans>Unknown Source</Trans> <Trans>Unknown Source</Trans>
</ThemedText.Body> </ThemedText.Body>
</RowFixed> </RowFixed>
......
...@@ -7,12 +7,12 @@ import { RowBetween } from '../Row' ...@@ -7,12 +7,12 @@ import { RowBetween } from '../Row'
export const TextDot = styled.div` export const TextDot = styled.div`
height: 3px; height: 3px;
width: 3px; width: 3px;
background-color: ${({ theme }) => theme.text2}; background-color: ${({ theme }) => theme.deprecated_text2};
border-radius: 50%; border-radius: 50%;
` `
export const Checkbox = styled.input` export const Checkbox = styled.input`
border: 1px solid ${({ theme }) => theme.red3}; border: 1px solid ${({ theme }) => theme.deprecated_red3};
height: 20px; height: 20px;
margin: 0; margin: 0;
` `
...@@ -30,7 +30,7 @@ export const MenuItem = styled(RowBetween)` ...@@ -30,7 +30,7 @@ export const MenuItem = styled(RowBetween)`
cursor: ${({ disabled }) => !disabled && 'pointer'}; cursor: ${({ disabled }) => !disabled && 'pointer'};
pointer-events: ${({ disabled }) => disabled && 'none'}; pointer-events: ${({ disabled }) => disabled && 'none'};
:hover { :hover {
background-color: ${({ theme, disabled }) => !disabled && theme.bg2}; background-color: ${({ theme, disabled }) => !disabled && theme.deprecated_bg2};
} }
opacity: ${({ disabled, selected }) => (disabled || selected ? 0.5 : 1)}; opacity: ${({ disabled, selected }) => (disabled || selected ? 0.5 : 1)};
` `
...@@ -46,32 +46,32 @@ export const SearchInput = styled.input` ...@@ -46,32 +46,32 @@ export const SearchInput = styled.input`
border: none; border: none;
outline: none; outline: none;
border-radius: 20px; border-radius: 20px;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
border-style: solid; border-style: solid;
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
-webkit-appearance: none; -webkit-appearance: none;
font-size: 18px; font-size: 18px;
::placeholder { ::placeholder {
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
} }
transition: border 100ms; transition: border 100ms;
:focus { :focus {
border: 1px solid ${({ theme }) => theme.primary1}; border: 1px solid ${({ theme }) => theme.deprecated_primary1};
outline: none; outline: none;
} }
` `
export const Separator = styled.div` export const Separator = styled.div`
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
` `
export const SeparatorDark = styled.div` export const SeparatorDark = styled.div`
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
` `
export const LoadingRows = styled(BaseLoadingRows)` export const LoadingRows = styled(BaseLoadingRows)`
......
...@@ -27,7 +27,7 @@ const StyledMenuIcon = styled(Settings)` ...@@ -27,7 +27,7 @@ const StyledMenuIcon = styled(Settings)`
width: 20px; width: 20px;
> * { > * {
stroke: ${({ theme }) => theme.text1}; stroke: ${({ theme }) => theme.deprecated_text1};
} }
:hover { :hover {
...@@ -43,7 +43,7 @@ const StyledCloseIcon = styled(X)` ...@@ -43,7 +43,7 @@ const StyledCloseIcon = styled(X)`
} }
> * { > * {
stroke: ${({ theme }) => theme.text1}; stroke: ${({ theme }) => theme.deprecated_text1};
} }
` `
...@@ -83,8 +83,8 @@ const StyledMenu = styled.div` ...@@ -83,8 +83,8 @@ const StyledMenu = styled.div`
const MenuFlyout = styled.span` const MenuFlyout = styled.span`
min-width: 20.125rem; min-width: 20.125rem;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04), box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
0px 24px 32px rgba(0, 0, 0, 0.01); 0px 24px 32px rgba(0, 0, 0, 0.01);
border-radius: 12px; border-radius: 12px;
...@@ -106,7 +106,7 @@ const MenuFlyout = styled.span` ...@@ -106,7 +106,7 @@ const MenuFlyout = styled.span`
const Break = styled.div` const Break = styled.div`
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
` `
const ModalContentWrapper = styled.div` const ModalContentWrapper = styled.div`
...@@ -114,7 +114,7 @@ const ModalContentWrapper = styled.div` ...@@ -114,7 +114,7 @@ const ModalContentWrapper = styled.div`
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 2rem 0; padding: 2rem 0;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
border-radius: 20px; border-radius: 20px;
` `
...@@ -202,7 +202,7 @@ export default function SettingsTab({ placeholderSlippage }: { placeholderSlippa ...@@ -202,7 +202,7 @@ export default function SettingsTab({ placeholderSlippage }: { placeholderSlippa
{isSupportedChainId(chainId) && ( {isSupportedChainId(chainId) && (
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
<ThemedText.Black fontWeight={400} fontSize={14} color={theme.text2}> <ThemedText.Black fontWeight={400} fontSize={14} color={theme.deprecated_text2}>
<Trans>Auto Router API</Trans> <Trans>Auto Router API</Trans>
</ThemedText.Black> </ThemedText.Black>
<QuestionHelper text={<Trans>Use the Uniswap Labs API to get faster quotes.</Trans>} /> <QuestionHelper text={<Trans>Use the Uniswap Labs API to get faster quotes.</Trans>} />
...@@ -222,7 +222,7 @@ export default function SettingsTab({ placeholderSlippage }: { placeholderSlippa ...@@ -222,7 +222,7 @@ export default function SettingsTab({ placeholderSlippage }: { placeholderSlippa
)} )}
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
<ThemedText.Black fontWeight={400} fontSize={14} color={theme.text2}> <ThemedText.Black fontWeight={400} fontSize={14} color={theme.deprecated_text2}>
<Trans>Expert Mode</Trans> <Trans>Expert Mode</Trans>
</ThemedText.Black> </ThemedText.Black>
<QuestionHelper <QuestionHelper
......
...@@ -19,11 +19,11 @@ const StyledRangeInput = styled.input<{ size: number }>` ...@@ -19,11 +19,11 @@ const StyledRangeInput = styled.input<{ size: number }>`
-webkit-appearance: none; -webkit-appearance: none;
height: ${({ size }) => size}px; height: ${({ size }) => size}px;
width: ${({ size }) => size}px; width: ${({ size }) => size}px;
background-color: ${({ theme }) => theme.blue1}; background-color: ${({ theme }) => theme.deprecated_blue1};
border-radius: 100%; border-radius: 100%;
border: none; border: none;
transform: translateY(-50%); transform: translateY(-50%);
color: ${({ theme }) => theme.bg1}; color: ${({ theme }) => theme.deprecated_bg1};
&:hover, &:hover,
&:focus { &:focus {
...@@ -38,7 +38,7 @@ const StyledRangeInput = styled.input<{ size: number }>` ...@@ -38,7 +38,7 @@ const StyledRangeInput = styled.input<{ size: number }>`
background-color: #565a69; background-color: #565a69;
border-radius: 100%; border-radius: 100%;
border: none; border: none;
color: ${({ theme }) => theme.bg1}; color: ${({ theme }) => theme.deprecated_bg1};
&:hover, &:hover,
&:focus { &:focus {
...@@ -52,7 +52,7 @@ const StyledRangeInput = styled.input<{ size: number }>` ...@@ -52,7 +52,7 @@ const StyledRangeInput = styled.input<{ size: number }>`
width: ${({ size }) => size}px; width: ${({ size }) => size}px;
background-color: #565a69; background-color: #565a69;
border-radius: 100%; border-radius: 100%;
color: ${({ theme }) => theme.bg1}; color: ${({ theme }) => theme.deprecated_bg1};
&:hover, &:hover,
&:focus { &:focus {
...@@ -62,12 +62,16 @@ const StyledRangeInput = styled.input<{ size: number }>` ...@@ -62,12 +62,16 @@ const StyledRangeInput = styled.input<{ size: number }>`
} }
&::-webkit-slider-runnable-track { &::-webkit-slider-runnable-track {
background: linear-gradient(90deg, ${({ theme }) => theme.blue1}, ${({ theme }) => theme.blue2}); background: linear-gradient(
90deg,
${({ theme }) => theme.deprecated_blue1},
${({ theme }) => theme.deprecated_blue2}
);
height: 2px; height: 2px;
} }
&::-moz-range-track { &::-moz-range-track {
background: linear-gradient(90deg, ${({ theme }) => theme.bg5}, ${({ theme }) => theme.bg3}); background: linear-gradient(90deg, ${({ theme }) => theme.deprecated_bg5}, ${({ theme }) => theme.deprecated_bg3});
height: 2px; height: 2px;
} }
...@@ -76,14 +80,14 @@ const StyledRangeInput = styled.input<{ size: number }>` ...@@ -76,14 +80,14 @@ const StyledRangeInput = styled.input<{ size: number }>`
border-color: transparent; border-color: transparent;
color: transparent; color: transparent;
background: ${({ theme }) => theme.bg5}; background: ${({ theme }) => theme.deprecated_bg5};
height: 2px; height: 2px;
} }
&::-ms-fill-lower { &::-ms-fill-lower {
background: ${({ theme }) => theme.bg5}; background: ${({ theme }) => theme.deprecated_bg5};
} }
&::-ms-fill-upper { &::-ms-fill-upper {
background: ${({ theme }) => theme.bg3}; background: ${({ theme }) => theme.deprecated_bg3};
} }
` `
......
...@@ -7,9 +7,9 @@ const Input = styled.input<{ error?: boolean; fontSize?: string }>` ...@@ -7,9 +7,9 @@ const Input = styled.input<{ error?: boolean; fontSize?: string }>`
border: none; border: none;
flex: 1 1 auto; flex: 1 1 auto;
width: 0; width: 0;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
transition: color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')}; transition: color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')};
color: ${({ error, theme }) => (error ? theme.red1 : theme.text1)}; color: ${({ error, theme }) => (error ? theme.deprecated_red1 : theme.deprecated_text1)};
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: 500; font-weight: 500;
...@@ -27,7 +27,7 @@ const Input = styled.input<{ error?: boolean; fontSize?: string }>` ...@@ -27,7 +27,7 @@ const Input = styled.input<{ error?: boolean; fontSize?: string }>`
} }
::placeholder { ::placeholder {
color: ${({ theme }) => theme.text4}; color: ${({ theme }) => theme.deprecated_text4};
} }
` `
...@@ -38,9 +38,9 @@ const TextAreaInput = styled.textarea<{ error?: boolean; fontSize?: string }>` ...@@ -38,9 +38,9 @@ const TextAreaInput = styled.textarea<{ error?: boolean; fontSize?: string }>`
flex: 1 1 auto; flex: 1 1 auto;
width: 0; width: 0;
resize: none; resize: none;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
transition: color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')}; transition: color 300ms ${({ error }) => (error ? 'step-end' : 'step-start')};
color: ${({ error, theme }) => (error ? theme.red1 : theme.text1)}; color: ${({ error, theme }) => (error ? theme.deprecated_red1 : theme.deprecated_text1)};
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: 500; font-weight: 500;
...@@ -59,7 +59,7 @@ const TextAreaInput = styled.textarea<{ error?: boolean; fontSize?: string }>` ...@@ -59,7 +59,7 @@ const TextAreaInput = styled.textarea<{ error?: boolean; fontSize?: string }>`
} }
::placeholder { ::placeholder {
color: ${({ theme }) => theme.text4}; color: ${({ theme }) => theme.deprecated_text4};
} }
` `
......
...@@ -5,9 +5,9 @@ export const ToggleWrapper = styled.button<{ width?: string }>` ...@@ -5,9 +5,9 @@ export const ToggleWrapper = styled.button<{ width?: string }>`
align-items: center; align-items: center;
width: ${({ width }) => width ?? '100%'}; width: ${({ width }) => width ?? '100%'};
padding: 1px; padding: 1px;
background: ${({ theme }) => theme.bg1}; background: ${({ theme }) => theme.deprecated_bg1};
border-radius: 8px; border-radius: 8px;
border: ${({ theme }) => '1px solid ' + theme.bg2}; border: ${({ theme }) => '1px solid ' + theme.deprecated_bg2};
cursor: pointer; cursor: pointer;
outline: none; outline: none;
` `
...@@ -20,13 +20,13 @@ export const ToggleElement = styled.span<{ isActive?: boolean; fontSize?: string ...@@ -20,13 +20,13 @@ export const ToggleElement = styled.span<{ isActive?: boolean; fontSize?: string
border-radius: 6px; border-radius: 6px;
justify-content: center; justify-content: center;
height: 100%; height: 100%;
background: ${({ theme, isActive }) => (isActive ? theme.bg0 : 'none')}; background: ${({ theme, isActive }) => (isActive ? theme.deprecated_bg0 : 'none')};
color: ${({ theme, isActive }) => (isActive ? theme.text1 : theme.text3)}; color: ${({ theme, isActive }) => (isActive ? theme.deprecated_text1 : theme.deprecated_text3)};
font-size: ${({ fontSize }) => fontSize ?? '1rem'}; font-size: ${({ fontSize }) => fontSize ?? '1rem'};
font-weight: 500; font-weight: 500;
white-space: nowrap; white-space: nowrap;
:hover { :hover {
user-select: initial; user-select: initial;
color: ${({ theme, isActive }) => (isActive ? theme.text2 : theme.text3)}; color: ${({ theme, isActive }) => (isActive ? theme.deprecated_text2 : theme.deprecated_text3)};
} }
` `
...@@ -4,7 +4,7 @@ import styled, { keyframes } from 'styled-components/macro' ...@@ -4,7 +4,7 @@ import styled, { keyframes } from 'styled-components/macro'
const Wrapper = styled.button<{ isActive?: boolean; activeElement?: boolean }>` const Wrapper = styled.button<{ isActive?: boolean; activeElement?: boolean }>`
align-items: center; align-items: center;
background: ${({ theme }) => theme.bg1}; background: ${({ theme }) => theme.deprecated_bg1};
border: none; border: none;
border-radius: 20px; border-radius: 20px;
cursor: pointer; cursor: pointer;
...@@ -42,8 +42,8 @@ const ToggleElementHoverStyle = (hasBgColor: boolean, theme: any, isActive?: boo ...@@ -42,8 +42,8 @@ const ToggleElementHoverStyle = (hasBgColor: boolean, theme: any, isActive?: boo
opacity: '0.8', opacity: '0.8',
} }
: { : {
background: isActive ? darken(0.05, theme.primary1) : darken(0.05, theme.bg4), background: isActive ? darken(0.05, theme.deprecated_primary1) : darken(0.05, theme.deprecated_bg4),
color: isActive ? theme.white : theme.text3, color: isActive ? theme.deprecated_white : theme.deprecated_text3,
} }
const ToggleElement = styled.span<{ isActive?: boolean; bgColor?: string; isInitialToggleLoad?: boolean }>` const ToggleElement = styled.span<{ isActive?: boolean; bgColor?: string; isInitialToggleLoad?: boolean }>`
...@@ -51,7 +51,7 @@ const ToggleElement = styled.span<{ isActive?: boolean; bgColor?: string; isInit ...@@ -51,7 +51,7 @@ const ToggleElement = styled.span<{ isActive?: boolean; bgColor?: string; isInit
${({ isActive, isInitialToggleLoad }) => (isInitialToggleLoad ? 'none' : isActive ? turnOnToggle : turnOffToggle)} ${({ isActive, isInitialToggleLoad }) => (isInitialToggleLoad ? 'none' : isActive ? turnOnToggle : turnOffToggle)}
ease-in; ease-in;
background: ${({ theme, bgColor, isActive }) => background: ${({ theme, bgColor, isActive }) =>
isActive ? bgColor ?? theme.primary1 : !!bgColor ? theme.bg4 : theme.text3}; isActive ? bgColor ?? theme.deprecated_primary1 : !!bgColor ? theme.deprecated_bg4 : theme.deprecated_text3};
border-radius: 50%; border-radius: 50%;
height: 24px; height: 24px;
:hover { :hover {
......
...@@ -10,9 +10,9 @@ export const TooltipContainer = styled.div` ...@@ -10,9 +10,9 @@ export const TooltipContainer = styled.div`
font-weight: 400; font-weight: 400;
word-break: break-word; word-break: break-word;
background: ${({ theme }) => theme.bg0}; background: ${({ theme }) => theme.deprecated_bg0};
border-radius: 12px; border-radius: 12px;
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
box-shadow: 0 4px 8px 0 ${({ theme }) => transparentize(0.9, theme.shadow1)}; box-shadow: 0 4px 8px 0 ${({ theme }) => transparentize(0.9, theme.shadow1)};
` `
......
...@@ -48,7 +48,7 @@ export default function AnimatedConfirmation() { ...@@ -48,7 +48,7 @@ export default function AnimatedConfirmation() {
<Circle <Circle
className="path circle" className="path circle"
fill="none" fill="none"
stroke={theme.green1} stroke={theme.deprecated_green1}
strokeWidth="6" strokeWidth="6"
strokeMiterlimit="10" strokeMiterlimit="10"
cx="65.1" cx="65.1"
...@@ -58,7 +58,7 @@ export default function AnimatedConfirmation() { ...@@ -58,7 +58,7 @@ export default function AnimatedConfirmation() {
<PolyLine <PolyLine
className="path check" className="path check"
fill="none" fill="none"
stroke={theme.green1} stroke={theme.deprecated_green1}
strokeWidth="6" strokeWidth="6"
strokeLinecap="round" strokeLinecap="round"
strokeMiterlimit="10" strokeMiterlimit="10"
......
...@@ -127,7 +127,7 @@ function TransactionSubmittedContent({ ...@@ -127,7 +127,7 @@ function TransactionSubmittedContent({
</RowBetween> </RowBetween>
)} )}
<ConfirmedIcon inline={inline}> <ConfirmedIcon inline={inline}>
<ArrowUpCircle strokeWidth={0.5} size={inline ? '40px' : '90px'} color={theme.primary1} /> <ArrowUpCircle strokeWidth={0.5} size={inline ? '40px' : '90px'} color={theme.deprecated_primary1} />
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<Text fontWeight={500} fontSize={20} textAlign="center"> <Text fontWeight={500} fontSize={20} textAlign="center">
...@@ -135,7 +135,7 @@ function TransactionSubmittedContent({ ...@@ -135,7 +135,7 @@ function TransactionSubmittedContent({
</Text> </Text>
{chainId && hash && ( {chainId && hash && (
<ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)}> <ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)}>
<Text fontWeight={500} fontSize={14} color={theme.primary1}> <Text fontWeight={500} fontSize={14} color={theme.deprecated_primary1}>
<Trans>View on Explorer</Trans> <Trans>View on Explorer</Trans>
</Text> </Text>
</ExternalLink> </ExternalLink>
...@@ -149,7 +149,7 @@ function TransactionSubmittedContent({ ...@@ -149,7 +149,7 @@ function TransactionSubmittedContent({
) : ( ) : (
<RowFixed> <RowFixed>
<Trans>Added {currencyToAdd.symbol} </Trans> <Trans>Added {currencyToAdd.symbol} </Trans>
<CheckCircle size={'16px'} stroke={theme.green1} style={{ marginLeft: '6px' }} /> <CheckCircle size={'16px'} stroke={theme.deprecated_green1} style={{ marginLeft: '6px' }} />
</RowFixed> </RowFixed>
)} )}
</ButtonLight> </ButtonLight>
...@@ -204,11 +204,11 @@ export function TransactionErrorContent({ message, onDismiss }: { message: React ...@@ -204,11 +204,11 @@ export function TransactionErrorContent({ message, onDismiss }: { message: React
<CloseIcon onClick={onDismiss} /> <CloseIcon onClick={onDismiss} />
</RowBetween> </RowBetween>
<AutoColumn style={{ marginTop: 20, padding: '2rem 0' }} gap="24px" justify="center"> <AutoColumn style={{ marginTop: 20, padding: '2rem 0' }} gap="24px" justify="center">
<AlertTriangle color={theme.red1} style={{ strokeWidth: 1.5 }} size={64} /> <AlertTriangle color={theme.deprecated_red1} style={{ strokeWidth: 1.5 }} size={64} />
<Text <Text
fontWeight={500} fontWeight={500}
fontSize={16} fontSize={16}
color={theme.red1} color={theme.deprecated_red1}
style={{ textAlign: 'center', width: '85%', wordBreak: 'break-word' }} style={{ textAlign: 'center', width: '85%', wordBreak: 'break-word' }}
> >
{message} {message}
...@@ -268,10 +268,10 @@ function L2Content({ ...@@ -268,10 +268,10 @@ function L2Content({
<ConfirmedIcon inline={inline}> <ConfirmedIcon inline={inline}>
{confirmed ? ( {confirmed ? (
transactionSuccess ? ( transactionSuccess ? (
// <CheckCircle strokeWidth={1} size={inline ? '40px' : '90px'} color={theme.green1} /> // <CheckCircle strokeWidth={1} size={inline ? '40px' : '90px'} color={theme.deprecated_green1} />
<AnimatedConfirmation /> <AnimatedConfirmation />
) : ( ) : (
<AlertCircle strokeWidth={1} size={inline ? '40px' : '90px'} color={theme.red1} /> <AlertCircle strokeWidth={1} size={inline ? '40px' : '90px'} color={theme.deprecated_red1} />
) )
) : ( ) : (
<CustomLightSpinner src={Circle} alt="loader" size={inline ? '40px' : '90px'} /> <CustomLightSpinner src={Circle} alt="loader" size={inline ? '40px' : '90px'} />
...@@ -294,20 +294,20 @@ function L2Content({ ...@@ -294,20 +294,20 @@ function L2Content({
</Text> </Text>
{chainId && hash ? ( {chainId && hash ? (
<ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)}> <ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)}>
<Text fontWeight={500} fontSize={14} color={theme.primary1}> <Text fontWeight={500} fontSize={14} color={theme.deprecated_primary1}>
<Trans>View on Explorer</Trans> <Trans>View on Explorer</Trans>
</Text> </Text>
</ExternalLink> </ExternalLink>
) : ( ) : (
<div style={{ height: '17px' }} /> <div style={{ height: '17px' }} />
)} )}
<Text color={theme.text3} style={{ margin: '20px 0 0 0' }} fontSize={'14px'}> <Text color={theme.deprecated_text3} style={{ margin: '20px 0 0 0' }} fontSize={'14px'}>
{!secondsToConfirm ? ( {!secondsToConfirm ? (
<div style={{ height: '24px' }} /> <div style={{ height: '24px' }} />
) : ( ) : (
<div> <div>
<Trans>Transaction completed in </Trans> <Trans>Transaction completed in </Trans>
<span style={{ fontWeight: 500, marginLeft: '4px', color: theme.text1 }}> <span style={{ fontWeight: 500, marginLeft: '4px', color: theme.deprecated_text1 }}>
{secondsToConfirm} seconds 🎉 {secondsToConfirm} seconds 🎉
</span> </span>
</div> </div>
......
...@@ -23,21 +23,21 @@ enum DeadlineError { ...@@ -23,21 +23,21 @@ enum DeadlineError {
} }
const FancyButton = styled.button` const FancyButton = styled.button`
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
align-items: center; align-items: center;
height: 2rem; height: 2rem;
border-radius: 36px; border-radius: 36px;
font-size: 1rem; font-size: 1rem;
width: auto; width: auto;
min-width: 3.5rem; min-width: 3.5rem;
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
outline: none; outline: none;
background: ${({ theme }) => theme.bg1}; background: ${({ theme }) => theme.deprecated_bg1};
:hover { :hover {
border: 1px solid ${({ theme }) => theme.bg4}; border: 1px solid ${({ theme }) => theme.deprecated_bg4};
} }
:focus { :focus {
border: 1px solid ${({ theme }) => theme.primary1}; border: 1px solid ${({ theme }) => theme.deprecated_primary1};
} }
` `
...@@ -46,12 +46,12 @@ const Option = styled(FancyButton)<{ active: boolean }>` ...@@ -46,12 +46,12 @@ const Option = styled(FancyButton)<{ active: boolean }>`
:hover { :hover {
cursor: pointer; cursor: pointer;
} }
background-color: ${({ active, theme }) => active && theme.primary1}; background-color: ${({ active, theme }) => active && theme.deprecated_primary1};
color: ${({ active, theme }) => (active ? theme.white : theme.text1)}; color: ${({ active, theme }) => (active ? theme.deprecated_white : theme.deprecated_text1)};
` `
const Input = styled.input` const Input = styled.input`
background: ${({ theme }) => theme.bg1}; background: ${({ theme }) => theme.deprecated_bg1};
font-size: 16px; font-size: 16px;
width: auto; width: auto;
outline: none; outline: none;
...@@ -59,7 +59,7 @@ const Input = styled.input` ...@@ -59,7 +59,7 @@ const Input = styled.input`
&::-webkit-inner-spin-button { &::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;
} }
color: ${({ theme, color }) => (color === 'red' ? theme.red1 : theme.text1)}; color: ${({ theme, color }) => (color === 'red' ? theme.deprecated_red1 : theme.deprecated_text1)};
text-align: right; text-align: right;
` `
...@@ -69,10 +69,12 @@ const OptionCustom = styled(FancyButton)<{ active?: boolean; warning?: boolean } ...@@ -69,10 +69,12 @@ const OptionCustom = styled(FancyButton)<{ active?: boolean; warning?: boolean }
padding: 0 0.75rem; padding: 0 0.75rem;
flex: 1; flex: 1;
border: ${({ theme, active, warning }) => border: ${({ theme, active, warning }) =>
active ? `1px solid ${warning ? theme.red1 : theme.primary1}` : warning && `1px solid ${theme.red1}`}; active
? `1px solid ${warning ? theme.deprecated_red1 : theme.deprecated_primary1}`
: warning && `1px solid ${theme.deprecated_red1}`};
:hover { :hover {
border: ${({ theme, active, warning }) => border: ${({ theme, active, warning }) =>
active && `1px solid ${warning ? darken(0.1, theme.red1) : darken(0.1, theme.primary1)}`}; active && `1px solid ${warning ? darken(0.1, theme.deprecated_red1) : darken(0.1, theme.deprecated_primary1)}`};
} }
input { input {
...@@ -163,7 +165,7 @@ export default function TransactionSettings({ placeholderSlippage }: Transaction ...@@ -163,7 +165,7 @@ export default function TransactionSettings({ placeholderSlippage }: Transaction
<AutoColumn gap="md"> <AutoColumn gap="md">
<AutoColumn gap="sm"> <AutoColumn gap="sm">
<RowFixed> <RowFixed>
<ThemedText.Black fontWeight={400} fontSize={14} color={theme.text2}> <ThemedText.Black fontWeight={400} fontSize={14} color={theme.deprecated_text2}>
<Trans>Slippage tolerance</Trans> <Trans>Slippage tolerance</Trans>
</ThemedText.Black> </ThemedText.Black>
<QuestionHelper <QuestionHelper
...@@ -232,7 +234,7 @@ export default function TransactionSettings({ placeholderSlippage }: Transaction ...@@ -232,7 +234,7 @@ export default function TransactionSettings({ placeholderSlippage }: Transaction
{showCustomDeadlineRow && ( {showCustomDeadlineRow && (
<AutoColumn gap="sm"> <AutoColumn gap="sm">
<RowFixed> <RowFixed>
<ThemedText.Black fontSize={14} fontWeight={400} color={theme.text2}> <ThemedText.Black fontSize={14} fontWeight={400} color={theme.deprecated_text2}>
<Trans>Transaction deadline</Trans> <Trans>Transaction deadline</Trans>
</ThemedText.Black> </ThemedText.Black>
<QuestionHelper <QuestionHelper
......
...@@ -6,16 +6,16 @@ import styled from 'styled-components/macro' ...@@ -6,16 +6,16 @@ import styled from 'styled-components/macro'
import { ExternalLink } from '../../theme' import { ExternalLink } from '../../theme'
const InfoCard = styled.button<{ isActive?: boolean }>` const InfoCard = styled.button<{ isActive?: boolean }>`
background-color: ${({ theme, isActive }) => (isActive ? theme.bg3 : theme.bg2)}; background-color: ${({ theme, isActive }) => (isActive ? theme.deprecated_bg3 : theme.deprecated_bg2)};
padding: 1rem; padding: 1rem;
outline: none; outline: none;
border: 1px solid; border: 1px solid;
border-radius: 12px; border-radius: 12px;
width: 100% !important; width: 100% !important;
&:focus { &:focus {
box-shadow: 0 0 0 1px ${({ theme }) => theme.primary1}; box-shadow: 0 0 0 1px ${({ theme }) => theme.deprecated_primary1};
} }
border-color: ${({ theme, isActive }) => (isActive ? 'transparent' : theme.bg3)}; border-color: ${({ theme, isActive }) => (isActive ? 'transparent' : theme.deprecated_bg3)};
` `
const OptionCard = styled(InfoCard as any)` const OptionCard = styled(InfoCard as any)`
...@@ -37,7 +37,7 @@ const OptionCardClickable = styled(OptionCard as any)<{ clickable?: boolean }>` ...@@ -37,7 +37,7 @@ const OptionCardClickable = styled(OptionCard as any)<{ clickable?: boolean }>`
margin-top: 0; margin-top: 0;
&:hover { &:hover {
cursor: ${({ clickable }) => (clickable ? 'pointer' : '')}; cursor: ${({ clickable }) => (clickable ? 'pointer' : '')};
border: ${({ clickable, theme }) => (clickable ? `1px solid ${theme.primary1}` : ``)}; border: ${({ clickable, theme }) => (clickable ? `1px solid ${theme.deprecated_primary1}` : ``)};
} }
opacity: ${({ disabled }) => (disabled ? '0.5' : '1')}; opacity: ${({ disabled }) => (disabled ? '0.5' : '1')};
` `
...@@ -51,13 +51,13 @@ const GreenCircle = styled.div` ...@@ -51,13 +51,13 @@ const GreenCircle = styled.div`
height: 8px; height: 8px;
width: 8px; width: 8px;
margin-right: 8px; margin-right: 8px;
background-color: ${({ theme }) => theme.green1}; background-color: ${({ theme }) => theme.deprecated_green1};
border-radius: 50%; border-radius: 50%;
} }
` `
const CircleWrapper = styled.div` const CircleWrapper = styled.div`
color: ${({ theme }) => theme.green1}; color: ${({ theme }) => theme.deprecated_green1};
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -65,13 +65,14 @@ const CircleWrapper = styled.div` ...@@ -65,13 +65,14 @@ const CircleWrapper = styled.div`
const HeaderText = styled.div` const HeaderText = styled.div`
${({ theme }) => theme.flexRowNoWrap}; ${({ theme }) => theme.flexRowNoWrap};
color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.primary1 : ({ theme }) => theme.text1)}; color: ${(props) =>
props.color === 'blue' ? ({ theme }) => theme.deprecated_primary1 : ({ theme }) => theme.deprecated_text1};
font-size: 1rem; font-size: 1rem;
font-weight: 500; font-weight: 500;
` `
const SubHeader = styled.div` const SubHeader = styled.div`
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
margin-top: 10px; margin-top: 10px;
font-size: 12px; font-size: 12px;
` `
......
...@@ -41,7 +41,7 @@ const CloseIcon = styled.div` ...@@ -41,7 +41,7 @@ const CloseIcon = styled.div`
const CloseColor = styled(Close)` const CloseColor = styled(Close)`
path { path {
stroke: ${({ theme }) => theme.text4}; stroke: ${({ theme }) => theme.deprecated_text4};
} }
` `
...@@ -56,14 +56,14 @@ const HeaderRow = styled.div` ...@@ -56,14 +56,14 @@ const HeaderRow = styled.div`
${({ theme }) => theme.flexRowNoWrap}; ${({ theme }) => theme.flexRowNoWrap};
padding: 1rem 1rem; padding: 1rem 1rem;
font-weight: 500; font-weight: 500;
color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.primary1 : 'inherit')}; color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.deprecated_primary1 : 'inherit')};
${({ theme }) => theme.mediaWidth.upToMedium` ${({ theme }) => theme.mediaWidth.upToMedium`
padding: 1rem; padding: 1rem;
`}; `};
` `
const ContentWrapper = styled.div` const ContentWrapper = styled.div`
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
padding: 0 1rem 1rem 1rem; padding: 0 1rem 1rem 1rem;
border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
...@@ -98,7 +98,7 @@ const OptionGrid = styled.div` ...@@ -98,7 +98,7 @@ const OptionGrid = styled.div`
const HoverText = styled.div` const HoverText = styled.div`
text-decoration: none; text-decoration: none;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -40,55 +40,57 @@ const Web3StatusGeneric = styled(ButtonSecondary)` ...@@ -40,55 +40,57 @@ const Web3StatusGeneric = styled(ButtonSecondary)`
} }
` `
const Web3StatusError = styled(Web3StatusGeneric)` const Web3StatusError = styled(Web3StatusGeneric)`
background-color: ${({ theme }) => theme.red1}; background-color: ${({ theme }) => theme.deprecated_red1};
border: 1px solid ${({ theme }) => theme.red1}; border: 1px solid ${({ theme }) => theme.deprecated_red1};
color: ${({ theme }) => theme.white}; color: ${({ theme }) => theme.deprecated_white};
font-weight: 500; font-weight: 500;
:hover, :hover,
:focus { :focus {
background-color: ${({ theme }) => darken(0.1, theme.red1)}; background-color: ${({ theme }) => darken(0.1, theme.deprecated_red1)};
} }
` `
const Web3StatusConnect = styled(Web3StatusGeneric)<{ faded?: boolean }>` const Web3StatusConnect = styled(Web3StatusGeneric)<{ faded?: boolean }>`
background-color: ${({ theme }) => theme.primary4}; background-color: ${({ theme }) => theme.deprecated_primary4};
border: none; border: none;
color: ${({ theme }) => theme.primaryText1}; color: ${({ theme }) => theme.deprecated_primaryText1};
font-weight: 500; font-weight: 500;
:hover, :hover,
:focus { :focus {
border: 1px solid ${({ theme }) => darken(0.05, theme.primary4)}; border: 1px solid ${({ theme }) => darken(0.05, theme.deprecated_primary4)};
color: ${({ theme }) => theme.primaryText1}; color: ${({ theme }) => theme.deprecated_primaryText1};
} }
${({ faded }) => ${({ faded }) =>
faded && faded &&
css` css`
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
border: 1px solid ${({ theme }) => theme.primary5}; border: 1px solid ${({ theme }) => theme.deprecated_primary5};
color: ${({ theme }) => theme.primaryText1}; color: ${({ theme }) => theme.deprecated_primaryText1};
:hover, :hover,
:focus { :focus {
border: 1px solid ${({ theme }) => darken(0.05, theme.primary4)}; border: 1px solid ${({ theme }) => darken(0.05, theme.deprecated_primary4)};
color: ${({ theme }) => darken(0.05, theme.primaryText1)}; color: ${({ theme }) => darken(0.05, theme.deprecated_primaryText1)};
} }
`} `}
` `
const Web3StatusConnected = styled(Web3StatusGeneric)<{ pending?: boolean }>` const Web3StatusConnected = styled(Web3StatusGeneric)<{ pending?: boolean }>`
background-color: ${({ pending, theme }) => (pending ? theme.primary1 : theme.bg1)}; background-color: ${({ pending, theme }) => (pending ? theme.deprecated_primary1 : theme.deprecated_bg1)};
border: 1px solid ${({ pending, theme }) => (pending ? theme.primary1 : theme.bg1)}; border: 1px solid ${({ pending, theme }) => (pending ? theme.deprecated_primary1 : theme.deprecated_bg1)};
color: ${({ pending, theme }) => (pending ? theme.white : theme.text1)}; color: ${({ pending, theme }) => (pending ? theme.deprecated_white : theme.deprecated_text1)};
font-weight: 500; font-weight: 500;
:hover, :hover,
:focus { :focus {
border: 1px solid ${({ theme }) => darken(0.05, theme.bg3)}; border: 1px solid ${({ theme }) => darken(0.05, theme.deprecated_bg3)};
:focus { :focus {
border: 1px solid ${({ pending, theme }) => (pending ? darken(0.1, theme.primary1) : darken(0.1, theme.bg2))}; border: 1px solid
${({ pending, theme }) =>
pending ? darken(0.1, theme.deprecated_primary1) : darken(0.1, theme.deprecated_bg2)};
} }
} }
` `
......
...@@ -38,8 +38,11 @@ const Wrapper = styled(AutoColumn)<{ showBackground: boolean; bgColor: any }>` ...@@ -38,8 +38,11 @@ const Wrapper = styled(AutoColumn)<{ showBackground: boolean; bgColor: any }>`
position: relative; position: relative;
opacity: ${({ showBackground }) => (showBackground ? '1' : '1')}; opacity: ${({ showBackground }) => (showBackground ? '1' : '1')};
background: ${({ theme, bgColor, showBackground }) => background: ${({ theme, bgColor, showBackground }) =>
`radial-gradient(91.85% 100% at 1.84% 0%, ${bgColor} 0%, ${showBackground ? theme.black : theme.bg5} 100%) `}; `radial-gradient(91.85% 100% at 1.84% 0%, ${bgColor} 0%, ${
color: ${({ theme, showBackground }) => (showBackground ? theme.white : theme.text1)} !important; showBackground ? theme.deprecated_black : theme.deprecated_bg5
} 100%) `};
color: ${({ theme, showBackground }) =>
showBackground ? theme.deprecated_white : theme.deprecated_text1} !important;
${({ showBackground }) => ${({ showBackground }) =>
showBackground && showBackground &&
...@@ -164,13 +167,13 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo }) ...@@ -164,13 +167,13 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo })
<> <>
<Break /> <Break />
<BottomSection showBackground={true}> <BottomSection showBackground={true}>
<ThemedText.Black color={'white'} fontWeight={500}> <ThemedText.Black color={'deprecated_white'} fontWeight={500}>
<span> <span>
<Trans>Your rate</Trans> <Trans>Your rate</Trans>
</span> </span>
</ThemedText.Black> </ThemedText.Black>
<ThemedText.Black style={{ textAlign: 'right' }} color={'white'} fontWeight={500}> <ThemedText.Black style={{ textAlign: 'right' }} color={'deprecated_white'} fontWeight={500}>
<span role="img" aria-label="wizard-icon" style={{ marginRight: '0.5rem' }}> <span role="img" aria-label="wizard-icon" style={{ marginRight: '0.5rem' }}>
</span> </span>
......
...@@ -77,7 +77,7 @@ export function AdvancedSwapDetails({ ...@@ -77,7 +77,7 @@ export function AdvancedSwapDetails({
} }
disableHover={hideInfoTooltips} disableHover={hideInfoTooltips}
> >
<ThemedText.SubHeader color={theme.text1}> <ThemedText.SubHeader color={theme.deprecated_text1}>
<Trans>Expected Output</Trans> <Trans>Expected Output</Trans>
</ThemedText.SubHeader> </ThemedText.SubHeader>
</MouseoverTooltip> </MouseoverTooltip>
...@@ -96,7 +96,7 @@ export function AdvancedSwapDetails({ ...@@ -96,7 +96,7 @@ export function AdvancedSwapDetails({
text={<Trans>The impact your trade has on the market price of this pool.</Trans>} text={<Trans>The impact your trade has on the market price of this pool.</Trans>}
disableHover={hideInfoTooltips} disableHover={hideInfoTooltips}
> >
<ThemedText.SubHeader color={theme.text1}> <ThemedText.SubHeader color={theme.deprecated_text1}>
<Trans>Price Impact</Trans> <Trans>Price Impact</Trans>
</ThemedText.SubHeader> </ThemedText.SubHeader>
</MouseoverTooltip> </MouseoverTooltip>
...@@ -119,7 +119,7 @@ export function AdvancedSwapDetails({ ...@@ -119,7 +119,7 @@ export function AdvancedSwapDetails({
} }
disableHover={hideInfoTooltips} disableHover={hideInfoTooltips}
> >
<ThemedText.SubHeader color={theme.text3}> <ThemedText.SubHeader color={theme.deprecated_text3}>
{trade.tradeType === TradeType.EXACT_INPUT ? ( {trade.tradeType === TradeType.EXACT_INPUT ? (
<Trans>Minimum received</Trans> <Trans>Minimum received</Trans>
) : ( ) : (
...@@ -130,7 +130,7 @@ export function AdvancedSwapDetails({ ...@@ -130,7 +130,7 @@ export function AdvancedSwapDetails({
</MouseoverTooltip> </MouseoverTooltip>
</RowFixed> </RowFixed>
<TextWithLoadingPlaceholder syncing={syncing} width={70}> <TextWithLoadingPlaceholder syncing={syncing} width={70}>
<ThemedText.Black textAlign="right" fontSize={14} color={theme.text3}> <ThemedText.Black textAlign="right" fontSize={14} color={theme.deprecated_text3}>
{trade.tradeType === TradeType.EXACT_INPUT {trade.tradeType === TradeType.EXACT_INPUT
? `${trade.minimumAmountOut(allowedSlippage).toSignificant(6)} ${trade.outputAmount.currency.symbol}` ? `${trade.minimumAmountOut(allowedSlippage).toSignificant(6)} ${trade.outputAmount.currency.symbol}`
: `${trade.maximumAmountIn(allowedSlippage).toSignificant(6)} ${trade.inputAmount.currency.symbol}`} : `${trade.maximumAmountIn(allowedSlippage).toSignificant(6)} ${trade.inputAmount.currency.symbol}`}
...@@ -147,12 +147,12 @@ export function AdvancedSwapDetails({ ...@@ -147,12 +147,12 @@ export function AdvancedSwapDetails({
} }
disableHover={hideInfoTooltips} disableHover={hideInfoTooltips}
> >
<ThemedText.SubHeader color={theme.text3}> <ThemedText.SubHeader color={theme.deprecated_text3}>
<Trans>Network Fee</Trans> <Trans>Network Fee</Trans>
</ThemedText.SubHeader> </ThemedText.SubHeader>
</MouseoverTooltip> </MouseoverTooltip>
<TextWithLoadingPlaceholder syncing={syncing} width={50}> <TextWithLoadingPlaceholder syncing={syncing} width={50}>
<ThemedText.Black textAlign="right" fontSize={14} color={theme.text3}> <ThemedText.Black textAlign="right" fontSize={14} color={theme.deprecated_text3}>
~${trade.gasUseEstimateUSD.toFixed(2)} ~${trade.gasUseEstimateUSD.toFixed(2)}
</ThemedText.Black> </ThemedText.Black>
</TextWithLoadingPlaceholder> </TextWithLoadingPlaceholder>
......
...@@ -17,8 +17,8 @@ const GasWrapper = styled(RowFixed)` ...@@ -17,8 +17,8 @@ const GasWrapper = styled(RowFixed)`
border-radius: 8px; border-radius: 8px;
padding: 4px 6px; padding: 4px 6px;
height: 24px; height: 24px;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
user-select: none; user-select: none;
...@@ -27,7 +27,7 @@ const StyledGasIcon = styled(GasIcon)` ...@@ -27,7 +27,7 @@ const StyledGasIcon = styled(GasIcon)`
margin-right: 4px; margin-right: 4px;
height: 14px; height: 14px;
& > * { & > * {
stroke: ${({ theme }) => theme.text3}; stroke: ${({ theme }) => theme.deprecated_text3};
} }
` `
......
...@@ -19,7 +19,7 @@ const StyledStaticRouterIcon = styled(StaticRouterIcon)` ...@@ -19,7 +19,7 @@ const StyledStaticRouterIcon = styled(StaticRouterIcon)`
height: 16px; height: 16px;
width: 16px; width: 16px;
fill: ${({ theme }) => theme.text3}; fill: ${({ theme }) => theme.deprecated_text3};
:hover { :hover {
filter: brightness(1.3); filter: brightness(1.3);
...@@ -30,7 +30,7 @@ const StyledAutoRouterLabel = styled(ThemedText.Black)` ...@@ -30,7 +30,7 @@ const StyledAutoRouterLabel = styled(ThemedText.Black)`
line-height: 1rem; line-height: 1rem;
/* fallback color */ /* fallback color */
color: ${({ theme }) => theme.green1}; color: ${({ theme }) => theme.deprecated_green1};
@supports (-webkit-background-clip: text) and (-webkit-text-fill-color: transparent) { @supports (-webkit-background-clip: text) and (-webkit-text-fill-color: transparent) {
background-image: linear-gradient(90deg, #2172e5 0%, #54e521 163.16%); background-image: linear-gradient(90deg, #2172e5 0%, #54e521 163.16%);
......
...@@ -30,24 +30,25 @@ const StyledInfoIcon = styled(Info)` ...@@ -30,24 +30,25 @@ const StyledInfoIcon = styled(Info)`
height: 16px; height: 16px;
width: 16px; width: 16px;
margin-right: 4px; margin-right: 4px;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
` `
const StyledCard = styled(OutlineCard)` const StyledCard = styled(OutlineCard)`
padding: 12px; padding: 12px;
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
` `
const StyledHeaderRow = styled(RowBetween)<{ disabled: boolean; open: boolean }>` const StyledHeaderRow = styled(RowBetween)<{ disabled: boolean; open: boolean }>`
padding: 4px 8px; padding: 4px 8px;
border-radius: 12px; border-radius: 12px;
background-color: ${({ open, theme }) => (open ? theme.bg1 : 'transparent')}; background-color: ${({ open, theme }) => (open ? theme.deprecated_bg1 : 'transparent')};
align-items: center; align-items: center;
cursor: ${({ disabled }) => (disabled ? 'initial' : 'pointer')}; cursor: ${({ disabled }) => (disabled ? 'initial' : 'pointer')};
min-height: 40px; min-height: 40px;
:hover { :hover {
background-color: ${({ theme, disabled }) => (disabled ? theme.bg1 : darken(0.015, theme.bg1))}; background-color: ${({ theme, disabled }) =>
disabled ? theme.deprecated_bg1 : darken(0.015, theme.deprecated_bg1)};
} }
` `
...@@ -63,7 +64,7 @@ const StyledPolling = styled.div` ...@@ -63,7 +64,7 @@ const StyledPolling = styled.div`
margin-right: 2px; margin-right: 2px;
margin-left: 10px; margin-left: 10px;
align-items: center; align-items: center;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
transition: 250ms ease color; transition: 250ms ease color;
${({ theme }) => theme.mediaWidth.upToMedium` ${({ theme }) => theme.mediaWidth.upToMedium`
...@@ -78,7 +79,7 @@ const StyledPollingDot = styled.div` ...@@ -78,7 +79,7 @@ const StyledPollingDot = styled.div`
min-width: 8px; min-width: 8px;
border-radius: 50%; border-radius: 50%;
position: relative; position: relative;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
transition: 250ms ease background-color; transition: 250ms ease background-color;
` `
...@@ -97,7 +98,7 @@ const Spinner = styled.div` ...@@ -97,7 +98,7 @@ const Spinner = styled.div`
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-right: 1px solid transparent; border-right: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
border-left: 2px solid ${({ theme }) => theme.text1}; border-left: 2px solid ${({ theme }) => theme.deprecated_text1};
background: transparent; background: transparent;
width: 14px; width: 14px;
height: 14px; height: 14px;
...@@ -159,7 +160,7 @@ export default function SwapDetailsDropdown({ ...@@ -159,7 +160,7 @@ export default function SwapDetailsDropdown({
placement="bottom" placement="bottom"
disableHover={showDetails} disableHover={showDetails}
> >
<StyledInfoIcon color={trade ? theme.text3 : theme.bg3} /> <StyledInfoIcon color={trade ? theme.deprecated_text3 : theme.deprecated_bg3} />
</MouseoverTooltipContent> </MouseoverTooltipContent>
</HideSmall> </HideSmall>
)} )}
...@@ -189,7 +190,10 @@ export default function SwapDetailsDropdown({ ...@@ -189,7 +190,10 @@ export default function SwapDetailsDropdown({
disableHover={showDetails} disableHover={showDetails}
/> />
)} )}
<RotatingArrow stroke={trade ? theme.text3 : theme.bg3} open={Boolean(trade && showDetails)} /> <RotatingArrow
stroke={trade ? theme.deprecated_text3 : theme.deprecated_bg3}
open={Boolean(trade && showDetails)}
/>
</RowFixed> </RowFixed>
</StyledHeaderRow> </StyledHeaderRow>
<AnimatedDropdown open={showDetails}> <AnimatedDropdown open={showDetails}>
......
...@@ -9,7 +9,7 @@ import SettingsTab from '../Settings' ...@@ -9,7 +9,7 @@ import SettingsTab from '../Settings'
const StyledSwapHeader = styled.div` const StyledSwapHeader = styled.div`
padding: 1rem 1.25rem 0.5rem 1.25rem; padding: 1rem 1.25rem 0.5rem 1.25rem;
width: 100%; width: 100%;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
` `
export default function SwapHeader({ allowedSlippage }: { allowedSlippage: Percent }) { export default function SwapHeader({ allowedSlippage }: { allowedSlippage: Percent }) {
......
...@@ -32,9 +32,9 @@ const ArrowWrapper = styled.div` ...@@ -32,9 +32,9 @@ const ArrowWrapper = styled.div`
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
border: 4px solid; border: 4px solid;
border-color: ${({ theme }) => theme.bg0}; border-color: ${({ theme }) => theme.deprecated_bg0};
z-index: 2; z-index: 2;
` `
...@@ -67,7 +67,7 @@ export default function SwapModalHeader({ ...@@ -67,7 +67,7 @@ export default function SwapModalHeader({
<TruncatedText <TruncatedText
fontSize={24} fontSize={24}
fontWeight={500} fontWeight={500}
color={showAcceptChanges && trade.tradeType === TradeType.EXACT_OUTPUT ? theme.primary1 : ''} color={showAcceptChanges && trade.tradeType === TradeType.EXACT_OUTPUT ? theme.deprecated_primary1 : ''}
> >
{trade.inputAmount.toSignificant(6)} {trade.inputAmount.toSignificant(6)}
</TruncatedText> </TruncatedText>
...@@ -85,7 +85,7 @@ export default function SwapModalHeader({ ...@@ -85,7 +85,7 @@ export default function SwapModalHeader({
</AutoColumn> </AutoColumn>
</LightCard> </LightCard>
<ArrowWrapper> <ArrowWrapper>
<ArrowDown size="16" color={theme.text2} /> <ArrowDown size="16" color={theme.deprecated_text2} />
</ArrowWrapper> </ArrowWrapper>
<LightCard padding="0.75rem 1rem" style={{ marginBottom: '0.25rem' }}> <LightCard padding="0.75rem 1rem" style={{ marginBottom: '0.25rem' }}>
<AutoColumn gap={'8px'}> <AutoColumn gap={'8px'}>
...@@ -103,7 +103,7 @@ export default function SwapModalHeader({ ...@@ -103,7 +103,7 @@ export default function SwapModalHeader({
</RowFixed> </RowFixed>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<ThemedText.Body fontSize={14} color={theme.text3}> <ThemedText.Body fontSize={14} color={theme.deprecated_text3}>
<FiatValue <FiatValue
fiatValue={fiatValueOutput} fiatValue={fiatValueOutput}
priceImpact={computeFiatValuePriceImpact(fiatValueInput, fiatValueOutput)} priceImpact={computeFiatValuePriceImpact(fiatValueInput, fiatValueOutput)}
...@@ -123,7 +123,7 @@ export default function SwapModalHeader({ ...@@ -123,7 +123,7 @@ export default function SwapModalHeader({
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
<AlertTriangle size={20} style={{ marginRight: '8px', minWidth: 24 }} /> <AlertTriangle size={20} style={{ marginRight: '8px', minWidth: 24 }} />
<ThemedText.Main color={theme.primary1}> <ThemedText.Main color={theme.deprecated_primary1}>
<Trans>Price Updated</Trans> <Trans>Price Updated</Trans>
</ThemedText.Main> </ThemedText.Main>
</RowFixed> </RowFixed>
......
...@@ -23,7 +23,7 @@ import { AutoRouterLabel, AutoRouterLogo } from './RouterLabel' ...@@ -23,7 +23,7 @@ import { AutoRouterLabel, AutoRouterLogo } from './RouterLabel'
const Wrapper = styled(AutoColumn)<{ darkMode?: boolean; fixedOpen?: boolean }>` const Wrapper = styled(AutoColumn)<{ darkMode?: boolean; fixedOpen?: boolean }>`
padding: ${({ fixedOpen }) => (fixedOpen ? '12px' : '12px 8px 12px 12px')}; padding: ${({ fixedOpen }) => (fixedOpen ? '12px' : '12px 8px 12px 12px')};
border-radius: 16px; border-radius: 16px;
border: 1px solid ${({ theme, fixedOpen }) => (fixedOpen ? 'transparent' : theme.bg2)}; border: 1px solid ${({ theme, fixedOpen }) => (fixedOpen ? 'transparent' : theme.deprecated_bg2)};
cursor: pointer; cursor: pointer;
` `
...@@ -33,7 +33,7 @@ const OpenCloseIcon = styled(Plus)<{ open?: boolean }>` ...@@ -33,7 +33,7 @@ const OpenCloseIcon = styled(Plus)<{ open?: boolean }>`
stroke-width: 2px; stroke-width: 2px;
transition: transform 0.1s; transition: transform 0.1s;
transform: ${({ open }) => (open ? 'rotate(45deg)' : 'none')}; transform: ${({ open }) => (open ? 'rotate(45deg)' : 'none')};
stroke: ${({ theme }) => theme.text3}; stroke: ${({ theme }) => theme.deprecated_text3};
cursor: pointer; cursor: pointer;
:hover { :hover {
opacity: 0.8; opacity: 0.8;
......
...@@ -10,7 +10,7 @@ import { ThemedText } from 'theme' ...@@ -10,7 +10,7 @@ import { ThemedText } from 'theme'
import { ResponsiveTooltipContainer } from './styleds' import { ResponsiveTooltipContainer } from './styleds'
const Wrapper = styled.div` const Wrapper = styled.div`
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
padding: 14px; padding: 14px;
...@@ -19,7 +19,7 @@ const Wrapper = styled.div` ...@@ -19,7 +19,7 @@ const Wrapper = styled.div`
` `
const StyledInfoIcon = styled(Info)` const StyledInfoIcon = styled(Info)`
stroke: ${({ theme }) => theme.text3}; stroke: ${({ theme }) => theme.deprecated_text3};
` `
/** /**
......
...@@ -60,7 +60,7 @@ export default function TradePrice({ price, showInverted, setShowInverted }: Tra ...@@ -60,7 +60,7 @@ export default function TradePrice({ price, showInverted, setShowInverted }: Tra
}} }}
title={text} title={text}
> >
<Text fontWeight={500} color={theme.text1}> <Text fontWeight={500} color={theme.deprecated_text1}>
{text} {text}
</Text>{' '} </Text>{' '}
{usdcPrice && ( {usdcPrice && (
......
...@@ -24,8 +24,8 @@ const DetailsFooter = styled.div<{ show: boolean }>` ...@@ -24,8 +24,8 @@ const DetailsFooter = styled.div<{ show: boolean }>`
max-width: 400px; max-width: 400px;
border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
background-color: ${({ theme }) => theme.advancedBG}; background-color: ${({ theme }) => theme.deprecated_advancedBG};
z-index: ${Z_INDEX.deprecated_zero}; z-index: ${Z_INDEX.deprecated_zero};
transform: ${({ show }) => (show ? 'translateY(0%)' : 'translateY(-100%)')}; transform: ${({ show }) => (show ? 'translateY(0%)' : 'translateY(-100%)')};
......
...@@ -25,8 +25,8 @@ export const ArrowWrapper = styled.div<{ clickable: boolean }>` ...@@ -25,8 +25,8 @@ export const ArrowWrapper = styled.div<{ clickable: boolean }>`
margin-bottom: -14px; margin-bottom: -14px;
left: calc(50% - 16px); left: calc(50% - 16px);
/* transform: rotate(90deg); */ /* transform: rotate(90deg); */
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
border: 4px solid ${({ theme }) => theme.bg0}; border: 4px solid ${({ theme }) => theme.deprecated_bg0};
z-index: 2; z-index: 2;
${({ clickable }) => ${({ clickable }) =>
clickable clickable
...@@ -42,18 +42,18 @@ export const ArrowWrapper = styled.div<{ clickable: boolean }>` ...@@ -42,18 +42,18 @@ export const ArrowWrapper = styled.div<{ clickable: boolean }>`
export const SectionBreak = styled.div` export const SectionBreak = styled.div`
height: 1px; height: 1px;
width: 100%; width: 100%;
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
` `
export const ErrorText = styled(Text)<{ severity?: 0 | 1 | 2 | 3 | 4 }>` export const ErrorText = styled(Text)<{ severity?: 0 | 1 | 2 | 3 | 4 }>`
color: ${({ theme, severity }) => color: ${({ theme, severity }) =>
severity === 3 || severity === 4 severity === 3 || severity === 4
? theme.red1 ? theme.deprecated_red1
: severity === 2 : severity === 2
? theme.yellow2 ? theme.deprecated_yellow2
: severity === 1 : severity === 1
? theme.text1 ? theme.deprecated_text1
: theme.text2}; : theme.deprecated_text2};
` `
export const TruncatedText = styled(Text)` export const TruncatedText = styled(Text)`
...@@ -86,7 +86,7 @@ export const Dots = styled.span` ...@@ -86,7 +86,7 @@ export const Dots = styled.span`
` `
const SwapCallbackErrorInner = styled.div` const SwapCallbackErrorInner = styled.div`
background-color: ${({ theme }) => transparentize(0.9, theme.red1)}; background-color: ${({ theme }) => transparentize(0.9, theme.deprecated_red1)};
border-radius: 1rem; border-radius: 1rem;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -94,7 +94,7 @@ const SwapCallbackErrorInner = styled.div` ...@@ -94,7 +94,7 @@ const SwapCallbackErrorInner = styled.div`
width: 100%; width: 100%;
padding: 3rem 1.25rem 1rem 1rem; padding: 3rem 1.25rem 1rem 1rem;
margin-top: -2rem; margin-top: -2rem;
color: ${({ theme }) => theme.red1}; color: ${({ theme }) => theme.deprecated_red1};
z-index: -1; z-index: -1;
p { p {
padding: 0; padding: 0;
...@@ -104,7 +104,7 @@ const SwapCallbackErrorInner = styled.div` ...@@ -104,7 +104,7 @@ const SwapCallbackErrorInner = styled.div`
` `
const SwapCallbackErrorInnerAlertTriangle = styled.div` const SwapCallbackErrorInnerAlertTriangle = styled.div`
background-color: ${({ theme }) => transparentize(0.9, theme.red1)}; background-color: ${({ theme }) => transparentize(0.9, theme.deprecated_red1)};
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -126,21 +126,21 @@ export function SwapCallbackError({ error }: { error: ReactNode }) { ...@@ -126,21 +126,21 @@ export function SwapCallbackError({ error }: { error: ReactNode }) {
} }
export const SwapShowAcceptChanges = styled(AutoColumn)` export const SwapShowAcceptChanges = styled(AutoColumn)`
background-color: ${({ theme }) => transparentize(0.95, theme.primary3)}; background-color: ${({ theme }) => transparentize(0.95, theme.deprecated_primary3)};
color: ${({ theme }) => theme.primaryText1}; color: ${({ theme }) => theme.deprecated_primaryText1};
padding: 0.5rem; padding: 0.5rem;
border-radius: 12px; border-radius: 12px;
margin-top: 8px; margin-top: 8px;
` `
export const TransactionDetailsLabel = styled(ThemedText.Black)` export const TransactionDetailsLabel = styled(ThemedText.Black)`
border-bottom: 1px solid ${({ theme }) => theme.bg2}; border-bottom: 1px solid ${({ theme }) => theme.deprecated_bg2};
padding-bottom: 0.5rem; padding-bottom: 0.5rem;
` `
export const ResponsiveTooltipContainer = styled(TooltipContainer)<{ origin?: string; width?: string }>` export const ResponsiveTooltipContainer = styled(TooltipContainer)<{ origin?: string; width?: string }>`
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
padding: 1rem; padding: 1rem;
width: ${({ width }) => width ?? 'auto'}; width: ${({ width }) => width ?? 'auto'};
......
...@@ -127,7 +127,7 @@ export default function ExecuteModal({ isOpen, onDismiss, proposalId }: ExecuteM ...@@ -127,7 +127,7 @@ export default function ExecuteModal({ isOpen, onDismiss, proposalId }: ExecuteM
<StyledClosed onClick={wrappedOnDismiss} /> <StyledClosed onClick={wrappedOnDismiss} />
</RowBetween> </RowBetween>
<ConfirmedIcon> <ConfirmedIcon>
<ArrowUpCircle strokeWidth={0.5} size={90} color={theme.primary1} /> <ArrowUpCircle strokeWidth={0.5} size={90} color={theme.deprecated_primary1} />
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
......
...@@ -5,7 +5,7 @@ import styled from 'styled-components/macro' ...@@ -5,7 +5,7 @@ import styled from 'styled-components/macro'
import { ThemedText } from 'theme' import { ThemedText } from 'theme'
const EmptyProposals = styled.div` const EmptyProposals = styled.div`
border: 1px solid ${({ theme }) => theme.text4}; border: 1px solid ${({ theme }) => theme.deprecated_text4};
padding: 16px 12px; padding: 16px 12px;
border-radius: 12px; border-radius: 12px;
display: flex; display: flex;
......
...@@ -127,7 +127,7 @@ export default function QueueModal({ isOpen, onDismiss, proposalId }: QueueModal ...@@ -127,7 +127,7 @@ export default function QueueModal({ isOpen, onDismiss, proposalId }: QueueModal
<StyledClosed onClick={wrappedOnDismiss} /> <StyledClosed onClick={wrappedOnDismiss} />
</RowBetween> </RowBetween>
<ConfirmedIcon> <ConfirmedIcon>
<ArrowUpCircle strokeWidth={0.5} size={90} color={theme.primary1} /> <ArrowUpCircle strokeWidth={0.5} size={90} color={theme.deprecated_primary1} />
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
......
...@@ -141,7 +141,7 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, voteOption }: ...@@ -141,7 +141,7 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, voteOption }:
<StyledClosed onClick={wrappedOnDismiss} /> <StyledClosed onClick={wrappedOnDismiss} />
</RowBetween> </RowBetween>
<ConfirmedIcon> <ConfirmedIcon>
<ArrowUpCircle strokeWidth={0.5} size={90} color={theme.primary1} /> <ArrowUpCircle strokeWidth={0.5} size={90} color={theme.deprecated_primary1} />
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
......
...@@ -744,7 +744,7 @@ export default function AddLiquidity() { ...@@ -744,7 +744,7 @@ export default function AddLiquidity() {
fontSize={14} fontSize={14}
style={{ fontWeight: 500 }} style={{ fontWeight: 500 }}
textAlign="left" textAlign="left"
color={theme.primaryText1} color={theme.deprecated_primaryText1}
> >
<Trans> <Trans>
This pool must be initialized before you can add liquidity. To initialize, select a This pool must be initialized before you can add liquidity. To initialize, select a
...@@ -761,7 +761,9 @@ export default function AddLiquidity() { ...@@ -761,7 +761,9 @@ export default function AddLiquidity() {
onUserInput={onStartPriceInput} onUserInput={onStartPriceInput}
/> />
</OutlineCard> </OutlineCard>
<RowBetween style={{ backgroundColor: theme.bg1, padding: '12px', borderRadius: '12px' }}> <RowBetween
style={{ backgroundColor: theme.deprecated_bg1, padding: '12px', borderRadius: '12px' }}
>
<ThemedText.Main> <ThemedText.Main>
<Trans>Current {baseCurrency?.symbol} Price:</Trans> <Trans>Current {baseCurrency?.symbol} Price:</Trans>
</ThemedText.Main> </ThemedText.Main>
...@@ -830,13 +832,13 @@ export default function AddLiquidity() { ...@@ -830,13 +832,13 @@ export default function AddLiquidity() {
$borderRadius="12px" $borderRadius="12px"
height="100%" height="100%"
style={{ style={{
borderColor: theme.yellow3, borderColor: theme.deprecated_yellow3,
border: '1px solid', border: '1px solid',
}} }}
> >
<AutoColumn gap="8px" style={{ height: '100%' }}> <AutoColumn gap="8px" style={{ height: '100%' }}>
<RowFixed> <RowFixed>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.deprecated_yellow3} size="16px" />
<ThemedText.Yellow ml="12px" fontSize="15px"> <ThemedText.Yellow ml="12px" fontSize="15px">
<Trans>Efficiency Comparison</Trans> <Trans>Efficiency Comparison</Trans>
</ThemedText.Yellow> </ThemedText.Yellow>
...@@ -846,7 +848,7 @@ export default function AddLiquidity() { ...@@ -846,7 +848,7 @@ export default function AddLiquidity() {
<Trans> <Trans>
Full range positions may earn less fees than concentrated positions. Learn more{' '} Full range positions may earn less fees than concentrated positions. Learn more{' '}
<ExternalLink <ExternalLink
style={{ color: theme.yellow3, textDecoration: 'underline' }} style={{ color: theme.deprecated_yellow3, textDecoration: 'underline' }}
href={ href={
'https://help.uniswap.org/en/articles/5434296-can-i-provide-liquidity-over-the-full-range-in-v3' 'https://help.uniswap.org/en/articles/5434296-can-i-provide-liquidity-over-the-full-range-in-v3'
} }
...@@ -882,7 +884,7 @@ export default function AddLiquidity() { ...@@ -882,7 +884,7 @@ export default function AddLiquidity() {
{outOfRange ? ( {outOfRange ? (
<YellowCard padding="8px 12px" $borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.deprecated_yellow3} size="16px" />
<ThemedText.Yellow ml="12px" fontSize="12px"> <ThemedText.Yellow ml="12px" fontSize="12px">
<Trans> <Trans>
Your position will not earn fees or be used in trades until the market price moves into Your position will not earn fees or be used in trades until the market price moves into
...@@ -896,7 +898,7 @@ export default function AddLiquidity() { ...@@ -896,7 +898,7 @@ export default function AddLiquidity() {
{invalidRange ? ( {invalidRange ? (
<YellowCard padding="8px 12px" $borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.deprecated_yellow3} size="16px" />
<ThemedText.Yellow ml="12px" fontSize="12px"> <ThemedText.Yellow ml="12px" fontSize="12px">
<Trans>Invalid range selected. The min price must be lower than the max price.</Trans> <Trans>Invalid range selected. The min price must be lower than the max price.</Trans>
</ThemedText.Yellow> </ThemedText.Yellow>
......
...@@ -49,7 +49,7 @@ export const CurrencyDropdown = styled(CurrencyInputPanel)` ...@@ -49,7 +49,7 @@ export const CurrencyDropdown = styled(CurrencyInputPanel)`
` `
export const StyledInput = styled(Input)` export const StyledInput = styled(Input)`
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
text-align: left; text-align: left;
font-size: 18px; font-size: 18px;
width: 100%; width: 100%;
...@@ -66,7 +66,7 @@ export const ResponsiveTwoColumns = styled.div<{ wide: boolean }>` ...@@ -66,7 +66,7 @@ export const ResponsiveTwoColumns = styled.div<{ wide: boolean }>`
padding-top: 20px; padding-top: 20px;
border-top: 1px solid ${({ theme }) => theme.bg2}; border-top: 1px solid ${({ theme }) => theme.deprecated_bg2};
${({ theme }) => theme.mediaWidth.upToMedium` ${({ theme }) => theme.mediaWidth.upToMedium`
grid-template-columns: 1fr; grid-template-columns: 1fr;
......
...@@ -27,7 +27,7 @@ export function PoolPriceBar({ ...@@ -27,7 +27,7 @@ export function PoolPriceBar({
<AutoRow justify="space-around" gap="4px"> <AutoRow justify="space-around" gap="4px">
<AutoColumn justify="center"> <AutoColumn justify="center">
<ThemedText.Black>{price?.toSignificant(6) ?? '-'}</ThemedText.Black> <ThemedText.Black>{price?.toSignificant(6) ?? '-'}</ThemedText.Black>
<Text fontWeight={500} fontSize={14} color={theme.text2} pt={1}> <Text fontWeight={500} fontSize={14} color={theme.deprecated_text2} pt={1}>
<Trans> <Trans>
{currencies[Field.CURRENCY_B]?.symbol} per {currencies[Field.CURRENCY_A]?.symbol} {currencies[Field.CURRENCY_B]?.symbol} per {currencies[Field.CURRENCY_A]?.symbol}
</Trans> </Trans>
...@@ -35,7 +35,7 @@ export function PoolPriceBar({ ...@@ -35,7 +35,7 @@ export function PoolPriceBar({
</AutoColumn> </AutoColumn>
<AutoColumn justify="center"> <AutoColumn justify="center">
<ThemedText.Black>{price?.invert()?.toSignificant(6) ?? '-'}</ThemedText.Black> <ThemedText.Black>{price?.invert()?.toSignificant(6) ?? '-'}</ThemedText.Black>
<Text fontWeight={500} fontSize={14} color={theme.text2} pt={1}> <Text fontWeight={500} fontSize={14} color={theme.deprecated_text2} pt={1}>
<Trans> <Trans>
{currencies[Field.CURRENCY_A]?.symbol} per {currencies[Field.CURRENCY_B]?.symbol} {currencies[Field.CURRENCY_A]?.symbol} per {currencies[Field.CURRENCY_B]?.symbol}
</Trans> </Trans>
...@@ -48,7 +48,7 @@ export function PoolPriceBar({ ...@@ -48,7 +48,7 @@ export function PoolPriceBar({
: (poolTokenPercentage?.lessThan(ONE_BIPS) ? '<0.01' : poolTokenPercentage?.toFixed(2)) ?? '0'} : (poolTokenPercentage?.lessThan(ONE_BIPS) ? '<0.01' : poolTokenPercentage?.toFixed(2)) ?? '0'}
% %
</ThemedText.Black> </ThemedText.Black>
<Text fontWeight={500} fontSize={14} color={theme.text2} pt={1}> <Text fontWeight={500} fontSize={14} color={theme.deprecated_text2} pt={1}>
<Trans>Share of Pool</Trans> <Trans>Share of Pool</Trans>
</Text> </Text>
</AutoColumn> </AutoColumn>
......
...@@ -346,13 +346,13 @@ export default function AddLiquidity() { ...@@ -346,13 +346,13 @@ export default function AddLiquidity() {
<ColumnCenter> <ColumnCenter>
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<ThemedText.Link fontWeight={600} color={'primaryText1'}> <ThemedText.Link fontWeight={600} color={'deprecated_primaryText1'}>
<Trans>You are the first liquidity provider.</Trans> <Trans>You are the first liquidity provider.</Trans>
</ThemedText.Link> </ThemedText.Link>
<ThemedText.Link fontWeight={400} color={'primaryText1'}> <ThemedText.Link fontWeight={400} color={'deprecated_primaryText1'}>
<Trans>The ratio of tokens you add will set the price of this pool.</Trans> <Trans>The ratio of tokens you add will set the price of this pool.</Trans>
</ThemedText.Link> </ThemedText.Link>
<ThemedText.Link fontWeight={400} color={'primaryText1'}> <ThemedText.Link fontWeight={400} color={'deprecated_primaryText1'}>
<Trans>Once you are happy with the rate click supply to review.</Trans> <Trans>Once you are happy with the rate click supply to review.</Trans>
</ThemedText.Link> </ThemedText.Link>
</AutoColumn> </AutoColumn>
...@@ -362,7 +362,7 @@ export default function AddLiquidity() { ...@@ -362,7 +362,7 @@ export default function AddLiquidity() {
<ColumnCenter> <ColumnCenter>
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<ThemedText.Link fontWeight={400} color={'primaryText1'}> <ThemedText.Link fontWeight={400} color={'deprecated_primaryText1'}>
<Trans> <Trans>
<b> <b>
<Trans>Tip:</Trans> <Trans>Tip:</Trans>
...@@ -389,7 +389,7 @@ export default function AddLiquidity() { ...@@ -389,7 +389,7 @@ export default function AddLiquidity() {
showCommonBases showCommonBases
/> />
<ColumnCenter> <ColumnCenter>
<Plus size="16" color={theme.text2} /> <Plus size="16" color={theme.deprecated_text2} />
</ColumnCenter> </ColumnCenter>
<CurrencyInputPanel <CurrencyInputPanel
value={formattedAmounts[Field.CURRENCY_B]} value={formattedAmounts[Field.CURRENCY_B]}
......
...@@ -7,7 +7,7 @@ export const BodyWrapper = styled.main<{ margin?: string; maxWidth?: string }>` ...@@ -7,7 +7,7 @@ export const BodyWrapper = styled.main<{ margin?: string; maxWidth?: string }>`
margin-top: ${({ margin }) => margin ?? '0px'}; margin-top: ${({ margin }) => margin ?? '0px'};
max-width: ${({ maxWidth }) => maxWidth ?? '480px'}; max-width: ${({ maxWidth }) => maxWidth ?? '480px'};
width: 100%; width: 100%;
background: ${({ theme }) => theme.bg0}; background: ${({ theme }) => theme.deprecated_bg0};
box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04), box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
0px 24px 32px rgba(0, 0, 0, 0.01); 0px 24px 32px rgba(0, 0, 0, 0.01);
border-radius: 24px; border-radius: 24px;
......
...@@ -28,13 +28,13 @@ const ContentWrapper = styled(Column)` ...@@ -28,13 +28,13 @@ const ContentWrapper = styled(Column)`
const ActionSelectorHeader = styled.div` const ActionSelectorHeader = styled.div`
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
` `
const ActionDropdown = styled(ButtonDropdown)` const ActionDropdown = styled(ButtonDropdown)`
padding: 0px; padding: 0px;
background-color: transparent; background-color: transparent;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
font-size: 1.25rem; font-size: 1.25rem;
:hover, :hover,
...@@ -51,8 +51,8 @@ const ProposalActionSelectorFlex = styled.div` ...@@ -51,8 +51,8 @@ const ProposalActionSelectorFlex = styled.div`
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
border-radius: 20px; border-radius: 20px;
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
` `
const ProposalActionSelectorContainer = styled.div` const ProposalActionSelectorContainer = styled.div`
......
...@@ -8,7 +8,7 @@ import styled from 'styled-components/macro' ...@@ -8,7 +8,7 @@ import styled from 'styled-components/macro'
const ProposalEditorHeader = styled(Text)` const ProposalEditorHeader = styled(Text)`
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
` `
const ProposalTitle = memo(styled(TextInput)` const ProposalTitle = memo(styled(TextInput)`
...@@ -20,8 +20,8 @@ const ProposalEditorContainer = styled.div` ...@@ -20,8 +20,8 @@ const ProposalEditorContainer = styled.div`
margin-top: 10px; margin-top: 10px;
padding: 0.75rem 1rem 0.75rem 1rem; padding: 0.75rem 1rem 0.75rem 1rem;
border-radius: 20px; border-radius: 20px;
border: 1px solid ${({ theme }) => theme.bg2}; border: 1px solid ${({ theme }) => theme.deprecated_bg2};
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
` `
export const ProposalEditor = ({ export const ProposalEditor = ({
......
...@@ -39,7 +39,7 @@ export const ProposalSubmissionModal = ({ ...@@ -39,7 +39,7 @@ export const ProposalSubmissionModal = ({
</Text> </Text>
{hash && ( {hash && (
<ExternalLink href={getExplorerLink(1, hash, ExplorerDataType.TRANSACTION)}> <ExternalLink href={getExplorerLink(1, hash, ExplorerDataType.TRANSACTION)}>
<Text fontWeight={500} fontSize={14} color={theme.primary1}> <Text fontWeight={500} fontSize={14} color={theme.deprecated_primary1}>
<Trans>View on Etherscan</Trans> <Trans>View on Etherscan</Trans>
</Text> </Text>
</ExternalLink> </ExternalLink>
......
...@@ -233,7 +233,7 @@ ${bodyValue} ...@@ -233,7 +233,7 @@ ${bodyValue}
<CreateProposalWrapper> <CreateProposalWrapper>
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<ThemedText.Link fontWeight={400} color={'primaryText1'}> <ThemedText.Link fontWeight={400} color={'deprecated_primaryText1'}>
<Trans> <Trans>
<strong>Tip:</strong> Select an action and describe your proposal for the community. The proposal <strong>Tip:</strong> Select an action and describe your proposal for the community. The proposal
cannot be modified after submission, so please verify all information before submitting. The voting cannot be modified after submission, so please verify all information before submitting. The voting
......
...@@ -51,11 +51,13 @@ const StyledDataCard = styled(DataCard)<{ bgColor?: any; showBackground?: any }> ...@@ -51,11 +51,13 @@ const StyledDataCard = styled(DataCard)<{ bgColor?: any; showBackground?: any }>
z-index: 2; z-index: 2;
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
background: ${({ theme, bgColor, showBackground }) => background: ${({ theme, bgColor, showBackground }) =>
`radial-gradient(91.85% 100% at 1.84% 0%, ${bgColor} 0%, ${showBackground ? theme.black : theme.bg5} 100%) `}; `radial-gradient(91.85% 100% at 1.84% 0%, ${bgColor} 0%, ${
showBackground ? theme.deprecated_black : theme.deprecated_bg5
} 100%) `};
` `
const StyledBottomCard = styled(DataCard)<{ dim: any }>` const StyledBottomCard = styled(DataCard)<{ dim: any }>`
background: ${({ theme }) => theme.bg3}; background: ${({ theme }) => theme.deprecated_bg3};
opacity: ${({ dim }) => (dim ? 0.4 : 1)}; opacity: ${({ dim }) => (dim ? 0.4 : 1)};
margin-top: -40px; margin-top: -40px;
padding: 0 1.25rem 1rem 1.25rem; padding: 0 1.25rem 1rem 1.25rem;
...@@ -65,7 +67,7 @@ const StyledBottomCard = styled(DataCard)<{ dim: any }>` ...@@ -65,7 +67,7 @@ const StyledBottomCard = styled(DataCard)<{ dim: any }>`
const PoolData = styled(DataCard)` const PoolData = styled(DataCard)`
background: none; background: none;
border: 1px solid ${({ theme }) => theme.bg4}; border: 1px solid ${({ theme }) => theme.deprecated_bg4};
padding: 1rem; padding: 1rem;
z-index: 1; z-index: 1;
` `
......
import { Trans } from '@lingui/macro' import { Trans } from '@lingui/macro'
import { useWeb3React } from '@web3-react/core' import { useWeb3React } from '@web3-react/core'
import useTheme from 'hooks/useTheme'
import JSBI from 'jsbi' import JSBI from 'jsbi'
import styled from 'styled-components/macro' import styled from 'styled-components/macro'
...@@ -40,6 +41,7 @@ flex-direction: column; ...@@ -40,6 +41,7 @@ flex-direction: column;
` `
export default function Earn() { export default function Earn() {
const theme = useTheme()
const { chainId } = useWeb3React() const { chainId } = useWeb3React()
// staking info for connected account // staking info for connected account
...@@ -75,7 +77,7 @@ export default function Earn() { ...@@ -75,7 +77,7 @@ export default function Earn() {
</ThemedText.White> </ThemedText.White>
</RowBetween>{' '} </RowBetween>{' '}
<ExternalLink <ExternalLink
style={{ color: 'white', textDecoration: 'underline' }} style={{ color: theme.deprecated_white, textDecoration: 'underline' }}
href="https://uniswap.org/blog/uni/" href="https://uniswap.org/blog/uni/"
target="_blank" target="_blank"
> >
......
...@@ -436,7 +436,7 @@ function V2PairMigration({ ...@@ -436,7 +436,7 @@ function V2PairMigration({
<FeeSelector feeAmount={feeAmount} handleFeePoolSelect={setFeeAmount} /> <FeeSelector feeAmount={feeAmount} handleFeePoolSelect={setFeeAmount} />
{noLiquidity && ( {noLiquidity && (
<BlueCard style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}> <BlueCard style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
<AlertCircle color={theme.text1} style={{ marginBottom: '12px', opacity: 0.8 }} /> <AlertCircle color={theme.deprecated_text1} style={{ marginBottom: '12px', opacity: 0.8 }} />
<ThemedText.Body <ThemedText.Body
fontSize={14} fontSize={14}
style={{ marginBottom: 8, fontWeight: 500, opacity: 0.8 }} style={{ marginBottom: 8, fontWeight: 500, opacity: 0.8 }}
...@@ -564,7 +564,7 @@ function V2PairMigration({ ...@@ -564,7 +564,7 @@ function V2PairMigration({
{outOfRange ? ( {outOfRange ? (
<YellowCard padding="8px 12px" $borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.deprecated_yellow3} size="16px" />
<ThemedText.Yellow ml="12px" fontSize="12px"> <ThemedText.Yellow ml="12px" fontSize="12px">
<Trans> <Trans>
Your position will not earn fees or be used in trades until the market price moves into your range. Your position will not earn fees or be used in trades until the market price moves into your range.
...@@ -577,7 +577,7 @@ function V2PairMigration({ ...@@ -577,7 +577,7 @@ function V2PairMigration({
{invalidRange ? ( {invalidRange ? (
<YellowCard padding="8px 12px" $borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.deprecated_yellow3} size="16px" />
<ThemedText.Yellow ml="12px" fontSize="12px"> <ThemedText.Yellow ml="12px" fontSize="12px">
<Trans>Invalid range selected. The min price must be lower than the max price.</Trans> <Trans>Invalid range selected. The min price must be lower than the max price.</Trans>
</ThemedText.Yellow> </ThemedText.Yellow>
......
...@@ -134,13 +134,13 @@ export default function MigrateV2() { ...@@ -134,13 +134,13 @@ export default function MigrateV2() {
{!account ? ( {!account ? (
<LightCard padding="40px"> <LightCard padding="40px">
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<Trans>Connect to a wallet to view your V2 liquidity.</Trans> <Trans>Connect to a wallet to view your V2 liquidity.</Trans>
</ThemedText.Body> </ThemedText.Body>
</LightCard> </LightCard>
) : v2IsLoading ? ( ) : v2IsLoading ? (
<LightCard padding="40px"> <LightCard padding="40px">
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<Dots> <Dots>
<Trans>Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
......
...@@ -28,15 +28,15 @@ const CTA1 = styled(ExternalLink)` ...@@ -28,15 +28,15 @@ const CTA1 = styled(ExternalLink)`
justify-content: center; justify-content: center;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
* { * {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
text-decoration: none !important; text-decoration: none !important;
} }
:hover { :hover {
border: 1px solid ${({ theme }) => theme.bg4}; border: 1px solid ${({ theme }) => theme.deprecated_bg4};
text-decoration: none; text-decoration: none;
* { * {
...@@ -53,15 +53,15 @@ const CTA2 = styled(ExternalLink)` ...@@ -53,15 +53,15 @@ const CTA2 = styled(ExternalLink)`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
* { * {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
text-decoration: none !important; text-decoration: none !important;
} }
:hover { :hover {
border: 1px solid ${({ theme }) => theme.bg4}; border: 1px solid ${({ theme }) => theme.deprecated_bg4};
text-decoration: none !important; text-decoration: none !important;
* { * {
text-decoration: none !important; text-decoration: none !important;
......
...@@ -90,7 +90,7 @@ const Label = styled(({ end, ...props }) => <ThemedText.Label {...props} />)<{ e ...@@ -90,7 +90,7 @@ const Label = styled(({ end, ...props }) => <ThemedText.Label {...props} />)<{ e
` `
const ExtentsText = styled.span` const ExtentsText = styled.span`
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
margin-right: 4px; margin-right: 4px;
...@@ -99,15 +99,15 @@ const ExtentsText = styled.span` ...@@ -99,15 +99,15 @@ const ExtentsText = styled.span`
const HoverText = styled(ThemedText.Main)` const HoverText = styled(ThemedText.Main)`
text-decoration: none; text-decoration: none;
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
:hover { :hover {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
text-decoration: none; text-decoration: none;
} }
` `
const DoubleArrow = styled.span` const DoubleArrow = styled.span`
color: ${({ theme }) => theme.text3}; color: ${({ theme }) => theme.deprecated_text3};
margin: 0 1rem; margin: 0 1rem;
` `
const ResponsiveRow = styled(RowBetween)` const ResponsiveRow = styled(RowBetween)`
...@@ -683,7 +683,7 @@ export function PositionPage() { ...@@ -683,7 +683,7 @@ export function PositionPage() {
<Trans>${fiatValueOfLiquidity.toFixed(2, { groupSeparator: ',' })}</Trans> <Trans>${fiatValueOfLiquidity.toFixed(2, { groupSeparator: ',' })}</Trans>
</ThemedText.LargeHeader> </ThemedText.LargeHeader>
) : ( ) : (
<ThemedText.LargeHeader color={theme.text1} fontSize="36px" fontWeight={500}> <ThemedText.LargeHeader color={theme.deprecated_text1} fontSize="36px" fontWeight={500}>
<Trans>$-</Trans> <Trans>$-</Trans>
</ThemedText.LargeHeader> </ThemedText.LargeHeader>
)} )}
...@@ -713,7 +713,7 @@ export function PositionPage() { ...@@ -713,7 +713,7 @@ export function PositionPage() {
</ThemedText.Main> </ThemedText.Main>
{typeof ratio === 'number' && !removed ? ( {typeof ratio === 'number' && !removed ? (
<Badge style={{ marginLeft: '10px' }}> <Badge style={{ marginLeft: '10px' }}>
<ThemedText.Main color={theme.text2} fontSize={11}> <ThemedText.Main color={theme.deprecated_text2} fontSize={11}>
<Trans>{inverted ? 100 - ratio : ratio}%</Trans> <Trans>{inverted ? 100 - ratio : ratio}%</Trans>
</ThemedText.Main> </ThemedText.Main>
</Badge> </Badge>
...@@ -733,11 +733,11 @@ export function PositionPage() { ...@@ -733,11 +733,11 @@ export function PositionPage() {
<Trans>Unclaimed fees</Trans> <Trans>Unclaimed fees</Trans>
</Label> </Label>
{fiatValueOfFees?.greaterThan(new Fraction(1, 100)) ? ( {fiatValueOfFees?.greaterThan(new Fraction(1, 100)) ? (
<ThemedText.LargeHeader color={theme.green1} fontSize="36px" fontWeight={500}> <ThemedText.LargeHeader color={theme.deprecated_green1} fontSize="36px" fontWeight={500}>
<Trans>${fiatValueOfFees.toFixed(2, { groupSeparator: ',' })}</Trans> <Trans>${fiatValueOfFees.toFixed(2, { groupSeparator: ',' })}</Trans>
</ThemedText.LargeHeader> </ThemedText.LargeHeader>
) : ( ) : (
<ThemedText.LargeHeader color={theme.text1} fontSize="36px" fontWeight={500}> <ThemedText.LargeHeader color={theme.deprecated_text1} fontSize="36px" fontWeight={500}>
<Trans>$-</Trans> <Trans>$-</Trans>
</ThemedText.LargeHeader> </ThemedText.LargeHeader>
)} )}
...@@ -753,11 +753,11 @@ export function PositionPage() { ...@@ -753,11 +753,11 @@ export function PositionPage() {
onClick={() => setShowConfirm(true)} onClick={() => setShowConfirm(true)}
> >
{!!collectMigrationHash && !isCollectPending ? ( {!!collectMigrationHash && !isCollectPending ? (
<ThemedText.Main color={theme.text1}> <ThemedText.Main color={theme.deprecated_text1}>
<Trans> Collected</Trans> <Trans> Collected</Trans>
</ThemedText.Main> </ThemedText.Main>
) : isCollectPending || collecting ? ( ) : isCollectPending || collecting ? (
<ThemedText.Main color={theme.text1}> <ThemedText.Main color={theme.deprecated_text1}>
{' '} {' '}
<Dots> <Dots>
<Trans>Collecting</Trans> <Trans>Collecting</Trans>
...@@ -765,7 +765,7 @@ export function PositionPage() { ...@@ -765,7 +765,7 @@ export function PositionPage() {
</ThemedText.Main> </ThemedText.Main>
) : ( ) : (
<> <>
<ThemedText.Main color={theme.white}> <ThemedText.Main color={theme.deprecated_white}>
<Trans>Collect fees</Trans> <Trans>Collect fees</Trans>
</ThemedText.Main> </ThemedText.Main>
</> </>
...@@ -868,7 +868,7 @@ export function PositionPage() { ...@@ -868,7 +868,7 @@ export function PositionPage() {
</ExtentsText> </ExtentsText>
{inRange && ( {inRange && (
<ThemedText.Small color={theme.text3}> <ThemedText.Small color={theme.deprecated_text3}>
<Trans>Your position will be 100% {currencyBase?.symbol} at this price.</Trans> <Trans>Your position will be 100% {currencyBase?.symbol} at this price.</Trans>
</ThemedText.Small> </ThemedText.Small>
)} )}
...@@ -892,7 +892,7 @@ export function PositionPage() { ...@@ -892,7 +892,7 @@ export function PositionPage() {
</ExtentsText> </ExtentsText>
{inRange && ( {inRange && (
<ThemedText.Small color={theme.text3}> <ThemedText.Small color={theme.deprecated_text3}>
<Trans>Your position will be 100% {currencyQuote?.symbol} at this price.</Trans> <Trans>Your position will be 100% {currencyQuote?.symbol} at this price.</Trans>
</ThemedText.Small> </ThemedText.Small>
)} )}
......
...@@ -39,7 +39,7 @@ const PageWrapper = styled(AutoColumn)` ...@@ -39,7 +39,7 @@ const PageWrapper = styled(AutoColumn)`
`}; `};
` `
const TitleRow = styled(RowBetween)` const TitleRow = styled(RowBetween)`
color: ${({ theme }) => theme.text2}; color: ${({ theme }) => theme.deprecated_text2};
${({ theme }) => theme.mediaWidth.upToSmall` ${({ theme }) => theme.mediaWidth.upToSmall`
flex-wrap: wrap; flex-wrap: wrap;
gap: 12px; gap: 12px;
...@@ -82,7 +82,7 @@ const MoreOptionsButton = styled(ButtonGray)` ...@@ -82,7 +82,7 @@ const MoreOptionsButton = styled(ButtonGray)`
flex: 1 1 auto; flex: 1 1 auto;
padding: 6px 8px; padding: 6px 8px;
width: 100%; width: 100%;
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
margin-right: 8px; margin-right: 8px;
` `
...@@ -126,7 +126,7 @@ const ResponsiveButtonPrimary = styled(ButtonPrimary)` ...@@ -126,7 +126,7 @@ const ResponsiveButtonPrimary = styled(ButtonPrimary)`
` `
const MainContentWrapper = styled.main` const MainContentWrapper = styled.main`
background-color: ${({ theme }) => theme.bg0}; background-color: ${({ theme }) => theme.deprecated_bg0};
padding: 8px; padding: 8px;
border-radius: 20px; border-radius: 20px;
display: flex; display: flex;
...@@ -168,7 +168,7 @@ function WrongNetworkCard() { ...@@ -168,7 +168,7 @@ function WrongNetworkCard() {
<MainContentWrapper> <MainContentWrapper>
<ErrorContainer> <ErrorContainer>
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<NetworkIcon strokeWidth={1.2} /> <NetworkIcon strokeWidth={1.2} />
<div data-testid="pools-unsupported-err"> <div data-testid="pools-unsupported-err">
<Trans> <Trans>
...@@ -298,7 +298,7 @@ export default function Pool() { ...@@ -298,7 +298,7 @@ export default function Pool() {
/> />
) : ( ) : (
<ErrorContainer> <ErrorContainer>
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<InboxIcon strokeWidth={1} /> <InboxIcon strokeWidth={1} />
<div> <div>
<Trans>Your active V3 liquidity positions will appear here.</Trans> <Trans>Your active V3 liquidity positions will appear here.</Trans>
......
...@@ -11,12 +11,12 @@ export const ClickableText = styled(Text)` ...@@ -11,12 +11,12 @@ export const ClickableText = styled(Text)`
:hover { :hover {
cursor: pointer; cursor: pointer;
} }
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
` `
export const MaxButton = styled.button<{ width: string }>` export const MaxButton = styled.button<{ width: string }>`
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
background-color: ${({ theme }) => theme.primary5}; background-color: ${({ theme }) => theme.deprecated_primary5};
border: 1px solid ${({ theme }) => theme.primary5}; border: 1px solid ${({ theme }) => theme.deprecated_primary5};
border-radius: 0.5rem; border-radius: 0.5rem;
font-size: 1rem; font-size: 1rem;
${({ theme }) => theme.mediaWidth.upToSmall` ${({ theme }) => theme.mediaWidth.upToSmall`
...@@ -26,12 +26,12 @@ export const MaxButton = styled.button<{ width: string }>` ...@@ -26,12 +26,12 @@ export const MaxButton = styled.button<{ width: string }>`
cursor: pointer; cursor: pointer;
margin: 0.25rem; margin: 0.25rem;
overflow: hidden; overflow: hidden;
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
:hover { :hover {
border: 1px solid ${({ theme }) => theme.primary1}; border: 1px solid ${({ theme }) => theme.deprecated_primary1};
} }
:focus { :focus {
border: 1px solid ${({ theme }) => theme.primary1}; border: 1px solid ${({ theme }) => theme.deprecated_primary1};
outline: none; outline: none;
} }
` `
......
...@@ -71,7 +71,7 @@ const ResponsiveButtonSecondary = styled(ButtonSecondary)` ...@@ -71,7 +71,7 @@ const ResponsiveButtonSecondary = styled(ButtonSecondary)`
` `
const EmptyProposals = styled.div` const EmptyProposals = styled.div`
border: 1px solid ${({ theme }) => theme.text4}; border: 1px solid ${({ theme }) => theme.deprecated_text4};
padding: 16px 12px; padding: 16px 12px;
border-radius: 12px; border-radius: 12px;
display: flex; display: flex;
...@@ -160,7 +160,7 @@ export default function Pool() { ...@@ -160,7 +160,7 @@ export default function Pool() {
</ThemedText.White> </ThemedText.White>
</RowBetween> </RowBetween>
<ExternalLink <ExternalLink
style={{ color: 'white', textDecoration: 'underline' }} style={{ color: theme.deprecated_white, textDecoration: 'underline' }}
target="_blank" target="_blank"
href="https://uniswap.org/docs/v2/core-concepts/pools/" href="https://uniswap.org/docs/v2/core-concepts/pools/"
> >
...@@ -178,7 +178,7 @@ export default function Pool() { ...@@ -178,7 +178,7 @@ export default function Pool() {
<AutoColumn gap="lg" justify="center"> <AutoColumn gap="lg" justify="center">
<AutoColumn gap="md" style={{ width: '100%' }}> <AutoColumn gap="md" style={{ width: '100%' }}>
<Layer2Prompt> <Layer2Prompt>
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<Trans>V2 Pool is not available on Layer 2. Switch to Layer 1 Ethereum.</Trans> <Trans>V2 Pool is not available on Layer 2. Switch to Layer 1 Ethereum.</Trans>
</ThemedText.Body> </ThemedText.Body>
</Layer2Prompt> </Layer2Prompt>
...@@ -212,13 +212,13 @@ export default function Pool() { ...@@ -212,13 +212,13 @@ export default function Pool() {
{!account ? ( {!account ? (
<Card padding="40px"> <Card padding="40px">
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<Trans>Connect to a wallet to view your liquidity.</Trans> <Trans>Connect to a wallet to view your liquidity.</Trans>
</ThemedText.Body> </ThemedText.Body>
</Card> </Card>
) : v2IsLoading ? ( ) : v2IsLoading ? (
<EmptyProposals> <EmptyProposals>
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<Dots> <Dots>
<Trans>Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
...@@ -269,7 +269,7 @@ export default function Pool() { ...@@ -269,7 +269,7 @@ export default function Pool() {
</> </>
) : ( ) : (
<EmptyProposals> <EmptyProposals>
<ThemedText.Body color={theme.text3} textAlign="center"> <ThemedText.Body color={theme.deprecated_text3} textAlign="center">
<Trans>No liquidity found.</Trans> <Trans>No liquidity found.</Trans>
</ThemedText.Body> </ThemedText.Body>
</EmptyProposals> </EmptyProposals>
......
...@@ -104,7 +104,7 @@ export default function PoolFinder() { ...@@ -104,7 +104,7 @@ export default function PoolFinder() {
<AutoColumn style={{ padding: '1rem' }} gap="md"> <AutoColumn style={{ padding: '1rem' }} gap="md">
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<ThemedText.Link fontWeight={400} color={'primaryText1'}> <ThemedText.Link fontWeight={400} color={'deprecated_primaryText1'}>
<Trans> <Trans>
<b>Tip:</b> Use this tool to find v2 pools that don&apos;t automatically appear in the interface. <b>Tip:</b> Use this tool to find v2 pools that don&apos;t automatically appear in the interface.
</Trans> </Trans>
......
...@@ -227,7 +227,7 @@ function Remove({ tokenId }: { tokenId: BigNumber }) { ...@@ -227,7 +227,7 @@ function Remove({ tokenId }: { tokenId: BigNumber }) {
</RowBetween> </RowBetween>
{feeValue0?.greaterThan(0) || feeValue1?.greaterThan(0) ? ( {feeValue0?.greaterThan(0) || feeValue1?.greaterThan(0) ? (
<> <>
<ThemedText.Italic fontSize={12} color={theme.text2} textAlign="left" padding={'8px 0 0 0'}> <ThemedText.Italic fontSize={12} color={theme.deprecated_text2} textAlign="left" padding={'8px 0 0 0'}>
<Trans>You will also collect fees earned from this position.</Trans> <Trans>You will also collect fees earned from this position.</Trans>
</ThemedText.Italic> </ThemedText.Italic>
<RowBetween> <RowBetween>
......
...@@ -303,7 +303,7 @@ export default function RemoveLiquidity() { ...@@ -303,7 +303,7 @@ export default function RemoveLiquidity() {
</RowFixed> </RowFixed>
</RowBetween> </RowBetween>
<RowFixed> <RowFixed>
<Plus size="16" color={theme.text2} /> <Plus size="16" color={theme.deprecated_text2} />
</RowFixed> </RowFixed>
<RowBetween align="flex-end"> <RowBetween align="flex-end">
<Text fontSize={24} fontWeight={500}> <Text fontSize={24} fontWeight={500}>
...@@ -317,7 +317,7 @@ export default function RemoveLiquidity() { ...@@ -317,7 +317,7 @@ export default function RemoveLiquidity() {
</RowFixed> </RowFixed>
</RowBetween> </RowBetween>
<ThemedText.Italic fontSize={12} color={theme.text2} textAlign="left" padding={'12px 0 0 0'}> <ThemedText.Italic fontSize={12} color={theme.deprecated_text2} textAlign="left" padding={'12px 0 0 0'}>
<Trans> <Trans>
Output is estimated. If the price changes by more than {allowedSlippage.toSignificant(4)}% your transaction Output is estimated. If the price changes by more than {allowedSlippage.toSignificant(4)}% your transaction
will revert. will revert.
...@@ -331,7 +331,7 @@ export default function RemoveLiquidity() { ...@@ -331,7 +331,7 @@ export default function RemoveLiquidity() {
return ( return (
<> <>
<RowBetween> <RowBetween>
<Text color={theme.text2} fontWeight={500} fontSize={16}> <Text color={theme.deprecated_text2} fontWeight={500} fontSize={16}>
<Trans> <Trans>
UNI {currencyA?.symbol}/{currencyB?.symbol} Burned UNI {currencyA?.symbol}/{currencyB?.symbol} Burned
</Trans> </Trans>
...@@ -346,16 +346,16 @@ export default function RemoveLiquidity() { ...@@ -346,16 +346,16 @@ export default function RemoveLiquidity() {
{pair && ( {pair && (
<> <>
<RowBetween> <RowBetween>
<Text color={theme.text2} fontWeight={500} fontSize={16}> <Text color={theme.deprecated_text2} fontWeight={500} fontSize={16}>
<Trans>Price</Trans> <Trans>Price</Trans>
</Text> </Text>
<Text fontWeight={500} fontSize={16} color={theme.text1}> <Text fontWeight={500} fontSize={16} color={theme.deprecated_text1}>
1 {currencyA?.symbol} = {tokenA ? pair.priceOf(tokenA).toSignificant(6) : '-'} {currencyB?.symbol} 1 {currencyA?.symbol} = {tokenA ? pair.priceOf(tokenA).toSignificant(6) : '-'} {currencyB?.symbol}
</Text> </Text>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<div /> <div />
<Text fontWeight={500} fontSize={16} color={theme.text1}> <Text fontWeight={500} fontSize={16} color={theme.deprecated_text1}>
1 {currencyB?.symbol} = {tokenB ? pair.priceOf(tokenB).toSignificant(6) : '-'} {currencyA?.symbol} 1 {currencyB?.symbol} = {tokenB ? pair.priceOf(tokenB).toSignificant(6) : '-'} {currencyA?.symbol}
</Text> </Text>
</RowBetween> </RowBetween>
...@@ -451,7 +451,7 @@ export default function RemoveLiquidity() { ...@@ -451,7 +451,7 @@ export default function RemoveLiquidity() {
<AutoColumn gap="md"> <AutoColumn gap="md">
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<ThemedText.Link fontWeight={400} color={'primaryText1'}> <ThemedText.Link fontWeight={400} color={'deprecated_primaryText1'}>
<Trans> <Trans>
<b>Tip:</b> Removing pool tokens converts your position back into underlying tokens at the current <b>Tip:</b> Removing pool tokens converts your position back into underlying tokens at the current
rate, proportional to your share of the pool. Accrued fees are included in the amounts you receive. rate, proportional to your share of the pool. Accrued fees are included in the amounts you receive.
...@@ -503,7 +503,7 @@ export default function RemoveLiquidity() { ...@@ -503,7 +503,7 @@ export default function RemoveLiquidity() {
{!showDetailed && ( {!showDetailed && (
<> <>
<ColumnCenter> <ColumnCenter>
<ArrowDown size="16" color={theme.text2} /> <ArrowDown size="16" color={theme.deprecated_text2} />
</ColumnCenter> </ColumnCenter>
<LightCard> <LightCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
...@@ -577,7 +577,7 @@ export default function RemoveLiquidity() { ...@@ -577,7 +577,7 @@ export default function RemoveLiquidity() {
id="liquidity-amount" id="liquidity-amount"
/> />
<ColumnCenter> <ColumnCenter>
<ArrowDown size="16" color={theme.text2} /> <ArrowDown size="16" color={theme.deprecated_text2} />
</ColumnCenter> </ColumnCenter>
<CurrencyInputPanel <CurrencyInputPanel
hideBalance={true} hideBalance={true}
...@@ -591,7 +591,7 @@ export default function RemoveLiquidity() { ...@@ -591,7 +591,7 @@ export default function RemoveLiquidity() {
id="remove-liquidity-tokena" id="remove-liquidity-tokena"
/> />
<ColumnCenter> <ColumnCenter>
<Plus size="16" color={theme.text2} /> <Plus size="16" color={theme.deprecated_text2} />
</ColumnCenter> </ColumnCenter>
<CurrencyInputPanel <CurrencyInputPanel
hideBalance={true} hideBalance={true}
......
...@@ -468,7 +468,11 @@ export default function Swap() { ...@@ -468,7 +468,11 @@ export default function Swap() {
setApprovalSubmitted(false) // reset 2 step UI for approvals setApprovalSubmitted(false) // reset 2 step UI for approvals
onSwitchTokens() onSwitchTokens()
}} }}
color={currencies[Field.INPUT] && currencies[Field.OUTPUT] ? theme.text1 : theme.text3} color={
currencies[Field.INPUT] && currencies[Field.OUTPUT]
? theme.deprecated_text1
: theme.deprecated_text3
}
/> />
</ArrowWrapper> </ArrowWrapper>
<Trace section={SectionName.CURRENCY_OUTPUT_PANEL}> <Trace section={SectionName.CURRENCY_OUTPUT_PANEL}>
...@@ -496,7 +500,7 @@ export default function Swap() { ...@@ -496,7 +500,7 @@ export default function Swap() {
<> <>
<AutoRow justify="space-between" style={{ padding: '0 1rem' }}> <AutoRow justify="space-between" style={{ padding: '0 1rem' }}>
<ArrowWrapper clickable={false}> <ArrowWrapper clickable={false}>
<ArrowDown size="16" color={theme.text2} /> <ArrowDown size="16" color={theme.deprecated_text2} />
</ArrowWrapper> </ArrowWrapper>
<LinkStyledButton id="remove-recipient-button" onClick={() => onChangeRecipient(null)}> <LinkStyledButton id="remove-recipient-button" onClick={() => onChangeRecipient(null)}>
<Trans>- Remove recipient</Trans> <Trans>- Remove recipient</Trans>
...@@ -584,7 +588,7 @@ export default function Swap() { ...@@ -584,7 +588,7 @@ export default function Swap() {
<Loader stroke="white" /> <Loader stroke="white" />
) : (approvalSubmitted && approvalState === ApprovalState.APPROVED) || ) : (approvalSubmitted && approvalState === ApprovalState.APPROVED) ||
signatureState === UseERC20PermitState.SIGNED ? ( signatureState === UseERC20PermitState.SIGNED ? (
<CheckCircle size="20" color={theme.green1} /> <CheckCircle size="20" color={theme.deprecated_green1} />
) : ( ) : (
<MouseoverTooltip <MouseoverTooltip
text={ text={
...@@ -594,7 +598,7 @@ export default function Swap() { ...@@ -594,7 +598,7 @@ export default function Swap() {
</Trans> </Trans>
} }
> >
<HelpCircle size="20" color={'white'} style={{ marginLeft: '8px' }} /> <HelpCircle size="20" color={'deprecated_white'} style={{ marginLeft: '8px' }} />
</MouseoverTooltip> </MouseoverTooltip>
)} )}
</AutoRow> </AutoRow>
......
...@@ -13,6 +13,7 @@ import { SwitchLocaleLink } from 'components/SwitchLocaleLink' ...@@ -13,6 +13,7 @@ import { SwitchLocaleLink } from 'components/SwitchLocaleLink'
import Toggle from 'components/Toggle' import Toggle from 'components/Toggle'
import DelegateModal from 'components/vote/DelegateModal' import DelegateModal from 'components/vote/DelegateModal'
import ProposalEmptyState from 'components/vote/ProposalEmptyState' import ProposalEmptyState from 'components/vote/ProposalEmptyState'
import useTheme from 'hooks/useTheme'
import JSBI from 'jsbi' import JSBI from 'jsbi'
import { darken } from 'polished' import { darken } from 'polished'
import { useState } from 'react' import { useState } from 'react'
...@@ -50,14 +51,14 @@ const Proposal = styled(Button)` ...@@ -50,14 +51,14 @@ const Proposal = styled(Button)`
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
text-decoration: none; text-decoration: none;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
&:focus { &:focus {
background-color: ${({ theme }) => darken(0.05, theme.bg1)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_bg1)};
} }
&:hover { &:hover {
background-color: ${({ theme }) => darken(0.05, theme.bg1)}; background-color: ${({ theme }) => darken(0.05, theme.deprecated_bg1)};
} }
` `
...@@ -88,7 +89,7 @@ const WrapSmall = styled(RowBetween)` ...@@ -88,7 +89,7 @@ const WrapSmall = styled(RowBetween)`
` `
const TextButton = styled(ThemedText.Main)` const TextButton = styled(ThemedText.Main)`
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
:hover { :hover {
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
...@@ -96,7 +97,7 @@ const TextButton = styled(ThemedText.Main)` ...@@ -96,7 +97,7 @@ const TextButton = styled(ThemedText.Main)`
` `
const AddressButton = styled.div` const AddressButton = styled.div`
border: 1px solid ${({ theme }) => theme.bg3}; border: 1px solid ${({ theme }) => theme.deprecated_bg3};
padding: 2px 4px; padding: 2px 4px;
border-radius: 8px; border-radius: 8px;
display: flex; display: flex;
...@@ -105,10 +106,11 @@ const AddressButton = styled.div` ...@@ -105,10 +106,11 @@ const AddressButton = styled.div`
` `
const StyledExternalLink = styled(ExternalLink)` const StyledExternalLink = styled(ExternalLink)`
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
` `
export default function Landing() { export default function Landing() {
const theme = useTheme()
const { account, chainId } = useWeb3React() const { account, chainId } = useWeb3React()
const [hideCancelled, setHideCancelled] = useState(true) const [hideCancelled, setHideCancelled] = useState(true)
...@@ -161,7 +163,10 @@ export default function Landing() { ...@@ -161,7 +163,10 @@ export default function Landing() {
</ThemedText.White> </ThemedText.White>
</RowBetween> </RowBetween>
<ExternalLink <ExternalLink
style={{ color: 'white', textDecoration: 'underline' }} style={{
color: theme.deprecated_white,
textDecoration: 'underline',
}}
href="https://uniswap.org/blog/uni" href="https://uniswap.org/blog/uni"
target="_blank" target="_blank"
> >
......
...@@ -60,7 +60,7 @@ const PageWrapper = styled(AutoColumn)` ...@@ -60,7 +60,7 @@ const PageWrapper = styled(AutoColumn)`
` `
const ProposalInfo = styled(AutoColumn)` const ProposalInfo = styled(AutoColumn)`
background: ${({ theme }) => theme.bg0}; background: ${({ theme }) => theme.deprecated_bg0};
border-radius: 12px; border-radius: 12px;
padding: 1.5rem; padding: 1.5rem;
position: relative; position: relative;
...@@ -73,10 +73,10 @@ const ArrowWrapper = styled(StyledInternalLink)` ...@@ -73,10 +73,10 @@ const ArrowWrapper = styled(StyledInternalLink)`
align-items: center; align-items: center;
gap: 8px; gap: 8px;
height: 24px; height: 24px;
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
a { a {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
text-decoration: none; text-decoration: none;
} }
:hover { :hover {
...@@ -93,7 +93,7 @@ const CardWrapper = styled.div` ...@@ -93,7 +93,7 @@ const CardWrapper = styled.div`
const StyledDataCard = styled(DataCard)` const StyledDataCard = styled(DataCard)`
width: 100%; width: 100%;
background: none; background: none;
background-color: ${({ theme }) => theme.bg1}; background-color: ${({ theme }) => theme.deprecated_bg1};
height: fit-content; height: fit-content;
z-index: 2; z-index: 2;
` `
...@@ -103,14 +103,14 @@ const ProgressWrapper = styled.div` ...@@ -103,14 +103,14 @@ const ProgressWrapper = styled.div`
margin-top: 1rem; margin-top: 1rem;
height: 4px; height: 4px;
border-radius: 4px; border-radius: 4px;
background-color: ${({ theme }) => theme.bg3}; background-color: ${({ theme }) => theme.deprecated_bg3};
position: relative; position: relative;
` `
const Progress = styled.div<{ status: 'for' | 'against'; percentageString?: string }>` const Progress = styled.div<{ status: 'for' | 'against'; percentageString?: string }>`
height: 4px; height: 4px;
border-radius: 4px; border-radius: 4px;
background-color: ${({ theme, status }) => (status === 'for' ? theme.green1 : theme.red1)}; background-color: ${({ theme, status }) => (status === 'for' ? theme.deprecated_green1 : theme.deprecated_red1)};
width: ${({ percentageString }) => percentageString ?? '0%'}; width: ${({ percentageString }) => percentageString ?? '0%'};
` `
......
...@@ -7,17 +7,17 @@ const handleColorType = (status: ProposalState, theme: DefaultTheme) => { ...@@ -7,17 +7,17 @@ const handleColorType = (status: ProposalState, theme: DefaultTheme) => {
switch (status) { switch (status) {
case ProposalState.PENDING: case ProposalState.PENDING:
case ProposalState.ACTIVE: case ProposalState.ACTIVE:
return theme.blue1 return theme.deprecated_blue1
case ProposalState.SUCCEEDED: case ProposalState.SUCCEEDED:
case ProposalState.EXECUTED: case ProposalState.EXECUTED:
return theme.green1 return theme.deprecated_green1
case ProposalState.DEFEATED: case ProposalState.DEFEATED:
return theme.red1 return theme.deprecated_red1
case ProposalState.QUEUED: case ProposalState.QUEUED:
case ProposalState.CANCELED: case ProposalState.CANCELED:
case ProposalState.EXPIRED: case ProposalState.EXPIRED:
default: default:
return theme.text3 return theme.deprecated_text3
} }
} }
......
...@@ -38,7 +38,7 @@ export const IconWrapper = styled.div<{ stroke?: string; size?: string; marginRi ...@@ -38,7 +38,7 @@ export const IconWrapper = styled.div<{ stroke?: string; size?: string; marginRi
margin-right: ${({ marginRight }) => marginRight ?? 0}; margin-right: ${({ marginRight }) => marginRight ?? 0};
margin-left: ${({ marginLeft }) => marginLeft ?? 0}; margin-left: ${({ marginLeft }) => marginLeft ?? 0};
& > * { & > * {
stroke: ${({ theme, stroke }) => stroke ?? theme.blue1}; stroke: ${({ theme, stroke }) => stroke ?? theme.deprecated_blue1};
} }
` `
...@@ -49,7 +49,7 @@ export const LinkStyledButton = styled.button<{ disabled?: boolean }>` ...@@ -49,7 +49,7 @@ export const LinkStyledButton = styled.button<{ disabled?: boolean }>`
background: none; background: none;
cursor: ${({ disabled }) => (disabled ? 'default' : 'pointer')}; cursor: ${({ disabled }) => (disabled ? 'default' : 'pointer')};
color: ${({ theme, disabled }) => (disabled ? theme.text2 : theme.primary1)}; color: ${({ theme, disabled }) => (disabled ? theme.deprecated_text2 : theme.deprecated_primary1)};
font-weight: 500; font-weight: 500;
:hover { :hover {
...@@ -70,7 +70,7 @@ export const LinkStyledButton = styled.button<{ disabled?: boolean }>` ...@@ -70,7 +70,7 @@ export const LinkStyledButton = styled.button<{ disabled?: boolean }>`
export const StyledInternalLink = styled(Link)` export const StyledInternalLink = styled(Link)`
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
font-weight: 500; font-weight: 500;
:hover { :hover {
...@@ -90,7 +90,7 @@ export const StyledInternalLink = styled(Link)` ...@@ -90,7 +90,7 @@ export const StyledInternalLink = styled(Link)`
const StyledLink = styled.a` const StyledLink = styled.a`
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
color: ${({ theme }) => theme.primary1}; color: ${({ theme }) => theme.deprecated_primary1};
font-weight: 500; font-weight: 500;
:hover { :hover {
...@@ -133,14 +133,14 @@ const LinkIcon = styled(LinkIconFeather)` ...@@ -133,14 +133,14 @@ const LinkIcon = styled(LinkIconFeather)`
height: 16px; height: 16px;
width: 18px; width: 18px;
margin-left: 10px; margin-left: 10px;
stroke: ${({ theme }) => theme.blue1}; stroke: ${({ theme }) => theme.deprecated_blue1};
` `
export const TrashIcon = styled(Trash)` export const TrashIcon = styled(Trash)`
height: 16px; height: 16px;
width: 18px; width: 18px;
margin-left: 10px; margin-left: 10px;
stroke: ${({ theme }) => theme.text3}; stroke: ${({ theme }) => theme.deprecated_text3};
cursor: pointer; cursor: pointer;
align-items: center; align-items: center;
...@@ -228,7 +228,7 @@ const Spinner = styled.img` ...@@ -228,7 +228,7 @@ const Spinner = styled.img`
` `
const BackArrowLink = styled(StyledInternalLink)` const BackArrowLink = styled(StyledInternalLink)`
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
` `
export function BackArrow({ to }: { to: string }) { export function BackArrow({ to }: { to: string }) {
return ( return (
...@@ -265,5 +265,5 @@ export const SmallOnly = styled.span` ...@@ -265,5 +265,5 @@ export const SmallOnly = styled.span`
export const Separator = styled.div` export const Separator = styled.div`
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: ${({ theme }) => theme.bg2}; background-color: ${({ theme }) => theme.deprecated_bg2};
` `
...@@ -48,67 +48,67 @@ const mediaWidthTemplates: { [width in keyof typeof MEDIA_WIDTHS]: typeof css } ...@@ -48,67 +48,67 @@ const mediaWidthTemplates: { [width in keyof typeof MEDIA_WIDTHS]: typeof css }
{} {}
) as any ) as any
const white = '#FFFFFF' const deprecated_white = '#FFFFFF'
const black = '#000000' const deprecated_black = '#000000'
function colors(darkMode: boolean): Colors { function colors(darkMode: boolean): Colors {
return { return {
darkMode, darkMode,
// base // base
white, deprecated_white,
black, deprecated_black,
// text // text
text1: darkMode ? '#FFFFFF' : '#000000', deprecated_text1: darkMode ? '#FFFFFF' : '#000000',
text2: darkMode ? '#C3C5CB' : '#565A69', deprecated_text2: darkMode ? '#C3C5CB' : '#565A69',
text3: darkMode ? '#8F96AC' : '#6E727D', deprecated_text3: darkMode ? '#8F96AC' : '#6E727D',
text4: darkMode ? '#B2B9D2' : '#C3C5CB', deprecated_text4: darkMode ? '#B2B9D2' : '#C3C5CB',
text5: darkMode ? '#2C2F36' : '#EDEEF2', deprecated_text5: darkMode ? '#2C2F36' : '#EDEEF2',
// backgrounds / greys // backgrounds / greys
bg0: darkMode ? '#191B1F' : '#FFF', deprecated_bg0: darkMode ? '#191B1F' : '#FFF',
bg1: darkMode ? '#212429' : '#F7F8FA', deprecated_bg1: darkMode ? '#212429' : '#F7F8FA',
bg2: darkMode ? '#2C2F36' : '#EDEEF2', deprecated_bg2: darkMode ? '#2C2F36' : '#EDEEF2',
bg3: darkMode ? '#40444F' : '#CED0D9', deprecated_bg3: darkMode ? '#40444F' : '#CED0D9',
bg4: darkMode ? '#565A69' : '#888D9B', deprecated_bg4: darkMode ? '#565A69' : '#888D9B',
bg5: darkMode ? '#6C7284' : '#888D9B', deprecated_bg5: darkMode ? '#6C7284' : '#888D9B',
bg6: darkMode ? '#1A2028' : '#6C7284', deprecated_bg6: darkMode ? '#1A2028' : '#6C7284',
//specialty colors //specialty colors
modalBG: darkMode ? 'rgba(0,0,0,.425)' : 'rgba(0,0,0,0.3)', deprecated_modalBG: darkMode ? 'rgba(0,0,0,.425)' : 'rgba(0,0,0,0.3)',
advancedBG: darkMode ? 'rgba(0,0,0,0.1)' : 'rgba(255,255,255,0.6)', deprecated_advancedBG: darkMode ? 'rgba(0,0,0,0.1)' : 'rgba(255,255,255,0.6)',
//primary colors //primary colors
primary1: darkMode ? '#2172E5' : '#E8006F', deprecated_primary1: darkMode ? '#2172E5' : '#E8006F',
primary2: darkMode ? '#3680E7' : '#FF8CC3', deprecated_primary2: darkMode ? '#3680E7' : '#FF8CC3',
primary3: darkMode ? '#4D8FEA' : '#FF99C9', deprecated_primary3: darkMode ? '#4D8FEA' : '#FF99C9',
primary4: darkMode ? '#376bad70' : '#F6DDE8', deprecated_primary4: darkMode ? '#376bad70' : '#F6DDE8',
primary5: darkMode ? '#153d6f70' : '#FDEAF1', deprecated_primary5: darkMode ? '#153d6f70' : '#FDEAF1',
// color text // color text
primaryText1: darkMode ? '#5090ea' : '#D50066', deprecated_primaryText1: darkMode ? '#5090ea' : '#D50066',
// secondary colors // secondary colors
secondary1: darkMode ? '#2172E5' : '#E8006F', deprecated_secondary1: darkMode ? '#2172E5' : '#E8006F',
secondary2: darkMode ? '#17000b26' : '#F6DDE8', deprecated_secondary2: darkMode ? '#17000b26' : '#F6DDE8',
secondary3: darkMode ? '#17000b26' : '#FDEAF1', deprecated_secondary3: darkMode ? '#17000b26' : '#FDEAF1',
// other // other
red1: darkMode ? '#FF4343' : '#DA2D2B', deprecated_red1: darkMode ? '#FF4343' : '#DA2D2B',
red2: darkMode ? '#F82D3A' : '#DF1F38', deprecated_red2: darkMode ? '#F82D3A' : '#DF1F38',
red3: '#D60000', deprecated_red3: '#D60000',
green1: darkMode ? '#27AE60' : '#007D35', deprecated_green1: darkMode ? '#27AE60' : '#007D35',
yellow1: '#E3A507', deprecated_yellow1: '#E3A507',
yellow2: '#FF8F00', deprecated_yellow2: '#FF8F00',
yellow3: '#F3B71E', deprecated_yellow3: '#F3B71E',
blue1: darkMode ? '#2172E5' : '#0068FC', deprecated_blue1: darkMode ? '#2172E5' : '#0068FC',
blue2: darkMode ? '#5199FF' : '#0068FC', deprecated_blue2: darkMode ? '#5199FF' : '#0068FC',
error: darkMode ? '#FD4040' : '#DF1F38', deprecated_error: darkMode ? '#FD4040' : '#DF1F38',
success: darkMode ? '#27AE60' : '#007D35', deprecated_success: darkMode ? '#27AE60' : '#007D35',
warning: '#FF8F00', deprecated_warning: '#FF8F00',
// dont wanna forget these blue yet // dont wanna forget these blue yet
blue4: darkMode ? '#153d6f70' : '#C4D9F8', deprecated_blue4: darkMode ? '#153d6f70' : '#C4D9F8',
// blue5: darkMode ? '#153d6f70' : '#EBF4FF', // blue5: darkMode ? '#153d6f70' : '#EBF4FF',
} }
} }
...@@ -158,22 +158,22 @@ const TextWrapper = styled(Text)<{ color: keyof Colors }>` ...@@ -158,22 +158,22 @@ const TextWrapper = styled(Text)<{ color: keyof Colors }>`
*/ */
export const ThemedText = { export const ThemedText = {
Main(props: TextProps) { Main(props: TextProps) {
return <TextWrapper fontWeight={500} color={'text2'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_text2'} {...props} />
}, },
Link(props: TextProps) { Link(props: TextProps) {
return <TextWrapper fontWeight={500} color={'primary1'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_primary1'} {...props} />
}, },
Label(props: TextProps) { Label(props: TextProps) {
return <TextWrapper fontWeight={600} color={'text1'} {...props} /> return <TextWrapper fontWeight={600} color={'deprecated_text1'} {...props} />
}, },
Black(props: TextProps) { Black(props: TextProps) {
return <TextWrapper fontWeight={500} color={'text1'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_text1'} {...props} />
}, },
White(props: TextProps) { White(props: TextProps) {
return <TextWrapper fontWeight={500} color={'white'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_white'} {...props} />
}, },
Body(props: TextProps) { Body(props: TextProps) {
return <TextWrapper fontWeight={400} fontSize={16} color={'text1'} {...props} /> return <TextWrapper fontWeight={400} fontSize={16} color={'deprecated_text1'} {...props} />
}, },
LargeHeader(props: TextProps) { LargeHeader(props: TextProps) {
return <TextWrapper fontWeight={600} fontSize={24} {...props} /> return <TextWrapper fontWeight={600} fontSize={24} {...props} />
...@@ -188,32 +188,32 @@ export const ThemedText = { ...@@ -188,32 +188,32 @@ export const ThemedText = {
return <TextWrapper fontWeight={500} fontSize={11} {...props} /> return <TextWrapper fontWeight={500} fontSize={11} {...props} />
}, },
Blue(props: TextProps) { Blue(props: TextProps) {
return <TextWrapper fontWeight={500} color={'blue1'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_blue1'} {...props} />
}, },
Yellow(props: TextProps) { Yellow(props: TextProps) {
return <TextWrapper fontWeight={500} color={'yellow3'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_yellow3'} {...props} />
}, },
DarkGray(props: TextProps) { DarkGray(props: TextProps) {
return <TextWrapper fontWeight={500} color={'text3'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_text3'} {...props} />
}, },
Gray(props: TextProps) { Gray(props: TextProps) {
return <TextWrapper fontWeight={500} color={'bg3'} {...props} /> return <TextWrapper fontWeight={500} color={'deprecated_bg3'} {...props} />
}, },
Italic(props: TextProps) { Italic(props: TextProps) {
return <TextWrapper fontWeight={500} fontSize={12} fontStyle={'italic'} color={'text2'} {...props} /> return <TextWrapper fontWeight={500} fontSize={12} fontStyle={'italic'} color={'deprecated_text2'} {...props} />
}, },
Error({ error, ...props }: { error: boolean } & TextProps) { Error({ error, ...props }: { error: boolean } & TextProps) {
return <TextWrapper fontWeight={500} color={error ? 'red1' : 'text2'} {...props} /> return <TextWrapper fontWeight={500} color={error ? 'deprecated_red1' : 'deprecated_text2'} {...props} />
}, },
} }
export const ThemedGlobalStyle = createGlobalStyle` export const ThemedGlobalStyle = createGlobalStyle`
html { html {
color: ${({ theme }) => theme.text1}; color: ${({ theme }) => theme.deprecated_text1};
background-color: ${({ theme }) => theme.bg1} !important; background-color: ${({ theme }) => theme.deprecated_bg1} !important;
} }
a { a {
color: ${({ theme }) => theme.blue1}; color: ${({ theme }) => theme.deprecated_blue1};
} }
` `
...@@ -5,58 +5,58 @@ export interface Colors { ...@@ -5,58 +5,58 @@ export interface Colors {
darkMode: boolean darkMode: boolean
// base // base
white: Color deprecated_white: Color
black: Color deprecated_black: Color
// text // text
text1: Color deprecated_text1: Color
text2: Color deprecated_text2: Color
text3: Color deprecated_text3: Color
text4: Color deprecated_text4: Color
text5: Color deprecated_text5: Color
// backgrounds / greys // backgrounds / greys
bg0: Color deprecated_bg0: Color
bg1: Color deprecated_bg1: Color
bg2: Color deprecated_bg2: Color
bg3: Color deprecated_bg3: Color
bg4: Color deprecated_bg4: Color
bg5: Color deprecated_bg5: Color
bg6: Color deprecated_bg6: Color
modalBG: Color deprecated_modalBG: Color
advancedBG: Color deprecated_advancedBG: Color
//blues //blues
primary1: Color deprecated_primary1: Color
primary2: Color deprecated_primary2: Color
primary3: Color deprecated_primary3: Color
primary4: Color deprecated_primary4: Color
primary5: Color deprecated_primary5: Color
primaryText1: Color deprecated_primaryText1: Color
// pinks // pinks
secondary1: Color deprecated_secondary1: Color
secondary2: Color deprecated_secondary2: Color
secondary3: Color deprecated_secondary3: Color
// other // other
red1: Color deprecated_red1: Color
red2: Color deprecated_red2: Color
red3: Color deprecated_red3: Color
green1: Color deprecated_green1: Color
yellow1: Color deprecated_yellow1: Color
yellow2: Color deprecated_yellow2: Color
yellow3: Color deprecated_yellow3: Color
blue1: Color deprecated_blue1: Color
blue2: Color deprecated_blue2: Color
blue4: Color deprecated_blue4: Color
error: Color deprecated_error: Color
success: Color deprecated_success: Color
warning: Color deprecated_warning: Color
} }
declare module 'styled-components/macro' { declare module 'styled-components/macro' {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment