Skip to content

Commit

Permalink
Fix colors
Browse files Browse the repository at this point in the history
  • Loading branch information
luccasmmg committed Aug 27, 2024
1 parent 3def79d commit 01b8196
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const buttonVariants = cva(
danger: "border-transparent bg-red-500 hover:bg-red-400 text-black",
success:
"border-transparent bg-green-500 hover:bg-green-400 text-black",
default: "bg-primary text-primary-foreground hover:bg-primary/90",
default: "bg-accent text-accent-foreground hover:bg-accent/90",
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
Expand Down
14 changes: 2 additions & 12 deletions frontend/src/pages/auth/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@ import { useForm } from "react-hook-form";
import { match } from "ts-pattern";

export const getServerSideProps: GetServerSideProps = async (context) => {
const session = await getServerAuthSession(context);

if (session) {
return {
redirect: {
destination: "/datasets",
permanent: false,
},
};
}
const csrfToken = await getCsrfToken(context);
return {
props: {
Expand Down Expand Up @@ -295,7 +285,7 @@ export default function SignUpPage({ csrfToken }: { csrfToken: string }) {
}
type="submit"
className={
"flex w-full justify-center rounded-md bg-[#006064] px-3 py-3 text-sm font-semibold leading-6 text-primary shadow-sm hover:bg-[#004D51] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-secondary" +
"flex w-full justify-center rounded-md px-3 py-3 text-sm font-semibold leading-6 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-secondary" +
(!!errors.password ||
!!errors.email ||
!!errors.name ||
Expand All @@ -310,7 +300,7 @@ export default function SignUpPage({ csrfToken }: { csrfToken: string }) {
.otherwise(() => (
<Button
disabled
className="flex w-full justify-center rounded-md bg-[#006064] px-3 py-3 text-sm font-semibold leading-6 text-primary shadow-sm hover:bg-[#004D51] focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-secondary"
className="flex w-full justify-center rounded-md px-3 py-3 text-sm font-semibold leading-6 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-secondary"
>
<Spinner />
</Button>
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
--popover-foreground: 222.2 84% 4.9%;
--primary: 182 100% 20%;
--primary-foreground: 210 40% 98%;
--secondary: 213 94% 68%;
--secondary-foreground: 210 40% 98%;
--accent: 182 100% 20%;
--accent-foreground: 0 0% 100%;
--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;
--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;
--border: 214.3 31.8% 91.4%;
Expand Down

0 comments on commit 01b8196

Please sign in to comment.