From 41919bb25bdc484a96ab3f78f430f2519106e359 Mon Sep 17 00:00:00 2001 From: Wayne Date: Mon, 12 Aug 2024 14:26:02 +0900 Subject: [PATCH] Adjust color and login page --- src/components/LoginPage/LoginForm.tsx | 5 +-- src/components/LoginPage/LoginPage.tsx | 40 +++++++++++++++++++++--- src/theme/devias-material-kit/colors.ts | 18 +++++++++++ src/theme/devias-material-kit/palette.ts | 11 ++++++- 4 files changed, 66 insertions(+), 8 deletions(-) diff --git a/src/components/LoginPage/LoginForm.tsx b/src/components/LoginPage/LoginForm.tsx index 38b1bab..8f28886 100644 --- a/src/components/LoginPage/LoginForm.tsx +++ b/src/components/LoginPage/LoginForm.tsx @@ -1,6 +1,6 @@ "use client"; -import { FormHelperText } from "@mui/material"; +import { FormHelperText, SxProps } from "@mui/material"; import Button from "@mui/material/Button"; import Stack from "@mui/material/Stack"; import TextField from "@mui/material/TextField"; @@ -31,7 +31,7 @@ const getHumanFriendlyErrorMessage = ( } }; -const LoginForm: React.FC = () => { +const LoginForm: React.FC<{ sx?: SxProps }> = ({ sx }) => { const { t } = useTranslation("login"); const { register, @@ -65,6 +65,7 @@ const LoginForm: React.FC = () => { margin={5} component="form" onSubmit={handleSubmit(onSubmit)} + sx={sx} > {t("Sign In")} { return ( - - + + - - - + + + diff --git a/src/theme/devias-material-kit/colors.ts b/src/theme/devias-material-kit/colors.ts index 8f82296..0ba01d8 100644 --- a/src/theme/devias-material-kit/colors.ts +++ b/src/theme/devias-material-kit/colors.ts @@ -11,7 +11,25 @@ export const neutral = { 900: "#111927", }; +// export const primary = { +// lightest: "#F5F7FF", +// light: "#EBEEFE", +// main: "#6366F1", +// dark: "#4338CA", +// darkest: "#312E81", +// contrastText: "#FFFFFF", +// }; + export const primary = { + lightest: "#f9fff5", + light: "#f9feeb", + main: "#8dba00", + dark: "#638a01", + darkest: "#4a5f14", + contrastText: "#FFFFFF", +}; + +export const secondary = { lightest: "#F5F7FF", light: "#EBEEFE", main: "#6366F1", diff --git a/src/theme/devias-material-kit/palette.ts b/src/theme/devias-material-kit/palette.ts index c24b6ec..33299eb 100644 --- a/src/theme/devias-material-kit/palette.ts +++ b/src/theme/devias-material-kit/palette.ts @@ -1,6 +1,14 @@ import { common } from "@mui/material/colors"; import { PaletteOptions } from "@mui/material/styles"; -import { error, primary, info, neutral, success, warning } from "./colors"; +import { + error, + primary, + secondary, + info, + neutral, + success, + warning, +} from "./colors"; const palette = { action: { @@ -20,6 +28,7 @@ const palette = { info, mode: "light", primary, + secondary, success, text: { primary: neutral[900],