diff --git a/.gitignore b/.gitignore index afa6ef13..c9f2a5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ scripts/claims_dev.json venv/ out/ .vscode -brownie-deploy/ \ No newline at end of file +brownie-deploy/ +.idea diff --git a/client/.prettierignore b/client/.prettierignore new file mode 100644 index 00000000..65b715e2 --- /dev/null +++ b/client/.prettierignore @@ -0,0 +1,6 @@ +**/.git +**/.svn +**/.hg +**/node_modules +**.idea +.next diff --git a/client/components/Card.tsx b/client/components/Card.tsx index ef855adb..ebee32ca 100644 --- a/client/components/Card.tsx +++ b/client/components/Card.tsx @@ -10,6 +10,7 @@ interface CardProps { noShadow?: Boolean; red?: Boolean; margin?: Boolean; + className?: string; } const Card: FunctionComponent = ({ @@ -21,20 +22,21 @@ const Card: FunctionComponent = ({ noShadow, red, margin, + className, }) => { const classes = classNames( - "overflow-x-auto w-full rounded-lg border h-full", + "overflow-x-auto w-full rounded-lg border border-accent-content h-full", { - "bg-secondary-focus text-white border-black": dark && !alt, - "bg-white text-black": !dark && !alt, + "bg-secondary-focus text-white border-accent-content": dark && !alt, + "bg-accent-content text-white": !dark && !alt, "p-4 md:p-5": tightPadding && !noPadding, "p-6 md:p-10": !tightPadding && !noPadding, - "bg-gray-100": alt && !dark, "shadow-lg": !noShadow, "px-4 py-5 md:px-5 md:py-6": tightPadding && !noPadding && noShadow, - "bg-[#dd0a0a1a] border-[#dd0a0a] text-[#dd0a0a]": red, + "text-error": red, "mt-6 h-full": margin, - } + }, + className ); return
{children}
; diff --git a/client/components/CardDescription.tsx b/client/components/CardDescription.tsx index 5b654228..0401d011 100644 --- a/client/components/CardDescription.tsx +++ b/client/components/CardDescription.tsx @@ -12,9 +12,7 @@ const CardDescription: FunctionComponent = ({ alt, large, }) => { - const classes = classNames("text-xs", { - "text-gray-300": alt, - "text-[#8293a4]": !alt, + const classes = classNames("text-xs text-neutral", { "text-base": large, }); diff --git a/client/components/CardLabel.tsx b/client/components/CardLabel.tsx index 04970f9d..e9492a76 100644 --- a/client/components/CardLabel.tsx +++ b/client/components/CardLabel.tsx @@ -5,7 +5,7 @@ interface CardLabelProps { } const CardLabel: FunctionComponent = ({ children }) => ( -
{children}
+
{children}
); export default CardLabel; diff --git a/client/components/CardStat.tsx b/client/components/CardStat.tsx index 3c69b0f3..469a88e4 100644 --- a/client/components/CardStat.tsx +++ b/client/components/CardStat.tsx @@ -1,4 +1,5 @@ import { FunctionComponent, ReactNode } from "react"; +import classnames from "classnames"; interface CardStatProps { children: ReactNode; @@ -12,13 +13,14 @@ const CardStat: FunctionComponent = ({ small, }) => (
{children}
diff --git a/client/components/CrossIcon.tsx b/client/components/CrossIcon.tsx index b83c9596..7d00fcf5 100644 --- a/client/components/CrossIcon.tsx +++ b/client/components/CrossIcon.tsx @@ -2,7 +2,7 @@ import { FunctionComponent } from "react"; import Image from "next/image"; const CrossIcon: FunctionComponent = () => ( - Ineligible + Ineligible ); export default CrossIcon; diff --git a/client/components/Footer.tsx b/client/components/Footer.tsx index 28666a40..d154e798 100644 --- a/client/components/Footer.tsx +++ b/client/components/Footer.tsx @@ -2,13 +2,13 @@ import { FunctionComponent } from "react"; import Wrapper from "components/Wrapper"; const Footer: FunctionComponent = () => ( -