merge main

This commit is contained in:
saml33 2022-12-14 10:16:50 +11:00
parent de642675e5
commit 30b86aaa23
6 changed files with 10 additions and 10 deletions

View File

@ -239,7 +239,7 @@ const AccountPage = () => {
group && mangoAccount ? (
<FlipNumbers
height={48}
width={36}
width={35}
play
delay={0.05}
duration={1}

View File

@ -39,7 +39,7 @@ const Button: FunctionComponent<ButtonCombinedProps> = ({
: size === 'large'
? 'h-12 px-6'
: 'h-8 px-3'
} default-transition font-bold ${
} default-transition font-display ${
theme === 'High Contrast' && !secondary
? 'text-th-bkg-1'
: 'text-th-fgd-1'

View File

@ -139,7 +139,7 @@ const DetailedAreaChart: FunctionComponent<DetailedAreaChartProps> = ({
{animationSettings['number-scroll'] ? (
<FlipNumbers
height={small ? 24 : 40}
width={small ? 18 : 31}
width={small ? 17 : 30}
play
numbers={
prefix +
@ -184,7 +184,7 @@ const DetailedAreaChart: FunctionComponent<DetailedAreaChartProps> = ({
{animationSettings['number-scroll'] ? (
<FlipNumbers
height={small ? 24 : 40}
width={small ? 18 : 31}
width={small ? 17 : 30}
play
numbers={
prefix +

View File

@ -15,11 +15,11 @@ const MaxAmountButton = ({
}) => {
return (
<LinkButton
className={`no-underline ${className}`}
className={`font-normal no-underline ${className}`}
disabled={disabled}
onClick={onClick}
>
<span className="mr-1 font-normal text-th-fgd-4">{label}:</span>
<p className="mr-1 text-th-fgd-4">{label}:</p>
<span className="font-mono text-th-fgd-2 underline">{value}</span>
</LinkButton>
)

View File

@ -182,11 +182,11 @@ const SwapTokenChart = () => {
) : null}
{mouseData ? (
<>
<div className="mb-1 flex flex-col font-body font-display text-5xl text-th-fgd-1 md:flex-row md:items-end">
<div className="mb-1 flex flex-col font-display text-5xl text-th-fgd-1 md:flex-row md:items-end">
{animationSettings['number-scroll'] ? (
<FlipNumbers
height={48}
width={36}
width={35}
play
numbers={formatFixedDecimals(mouseData['price'])}
/>
@ -209,7 +209,7 @@ const SwapTokenChart = () => {
{animationSettings['number-scroll'] ? (
<FlipNumbers
height={48}
width={36}
width={35}
play
numbers={formatFixedDecimals(
chartData[chartData.length - 1]['price']

View File

@ -120,7 +120,7 @@ const TokenPage = () => {
{animationSettings['number-scroll'] ? (
<FlipNumbers
height={48}
width={36}
width={35}
play
delay={0.05}
duration={1}