diff --git a/src/JoyTheme.ts b/src/JoyTheme.ts index e2b6b19..9d8af26 100644 --- a/src/JoyTheme.ts +++ b/src/JoyTheme.ts @@ -79,7 +79,7 @@ const joyTheme = extendJoyTheme({ palette: { divider: '#000', background: { - body: '#F4F6F6', + body: '#fff', }, primary: { softBg: '#AEDAFA', @@ -88,78 +88,6 @@ const joyTheme = extendJoyTheme({ }, }, }, - components: { - JoyCircularProgress: { - styleOverrides: { - root: ({ ownerState, theme }) => ({ - ...(ownerState.size === 'sm' && { - '--CircularProgress-size': '16px', - }), - }), - }, - }, - JoyButton: { - styleOverrides: { - root: ({ theme }) => ({ - borderRadius: 0, - border: '2px solid #000', - boxShadow: '2px 2px #000', - ':focus-visible': { - outline: 'none', - }, - }), - }, - }, - JoyCard: { - styleOverrides: { - root: ({ theme }) => ({ - border: '2px solid #000', - }), - }, - }, - JoyMenu: { - styleOverrides: { - root: ({ theme }) => ({ - borderRadius: 0, - border: '2px solid #000', - boxShadow: '1px 1px #000', - }), - }, - }, - JoyListDivider: { - styleOverrides: { - root: ({ theme }) => ({ - backgroundColor: '#000', - blockSize: '2px', - }), - }, - }, - JoyAvatar: { - styleOverrides: { - root: ({ theme }) => ({ - border: '2px solid #000', - boxShadow: '1px 1px #000', - }), - }, - }, - JoyListItemButton: { - styleOverrides: { - root: ({ theme }) => ({ - border: '2px solid #000', - boxShadow: '2px 2px #000', - marginBottom: '2px', - }), - }, - }, - JoyModalDialog: { - styleOverrides: { - root: ({ theme }) => ({ - border: '2px solid #000', - boxShadow: '4px 4px #000', - }), - }, - }, - }, }); // You can use your own `deepmerge` function. diff --git a/src/components/Layout/Navbar/index.tsx b/src/components/Layout/Navbar/index.tsx index ea92e50..9e65761 100644 --- a/src/components/Layout/Navbar/index.tsx +++ b/src/components/Layout/Navbar/index.tsx @@ -28,7 +28,6 @@ const ColorSchemeToggle = () => { size='sm' variant='outlined' color='primary' - sx={{ border: '2px solid #000', boxShadow: '2px 2px #000' }} onClick={() => { if (mode === 'light') { setMode('dark'); diff --git a/src/components/Layout/Wrappers/index.tsx b/src/components/Layout/Wrappers/index.tsx index 5d906ba..d1e5d0f 100644 --- a/src/components/Layout/Wrappers/index.tsx +++ b/src/components/Layout/Wrappers/index.tsx @@ -29,8 +29,8 @@ const Header = (props: BoxProps) => ( justifyContent: 'space-between', alignItems: 'center', gridColumn: '1 / -1', - borderBottom: '2px solid', - borderColor: 'divider', + borderBottom: '1px solid', + borderColor: '#ccc', position: 'fixed', minWidth: 'calc(100% - 48px)', top: 0, @@ -55,8 +55,6 @@ const SideNav = (props: BoxProps) => ( bottom: 0, minWidth: '240px', bgcolor: 'background.body', - borderRight: '2px solid', - borderColor: 'divider', display: { xs: 'none', sm: 'initial', diff --git a/src/components/daily/Daily/Actions/index.tsx b/src/components/daily/Daily/Actions/index.tsx index f5da1b8..6e6c86e 100644 --- a/src/components/daily/Daily/Actions/index.tsx +++ b/src/components/daily/Daily/Actions/index.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import IconButton from '@mui/joy/IconButton'; import MoreHoriz from '@mui/icons-material/MoreHoriz'; -import { ListDivider, Menu, MenuItem, IconButtonProps } from '@mui/joy'; +import { Menu, MenuItem, IconButtonProps } from '@mui/joy'; import DeleteDaily from '../../DeleteDaily'; import UpdateDaily from '../../UpdateDaily'; @@ -26,7 +26,7 @@ const Actions = (props: ActionsProps) => { variant='soft' color='neutral' size='sm' - sx={{ ml: 'auto', border: '2px solid', boxShadow: '1px 1px' }} + sx={{ ml: 'auto' }} onClick={handleClick} > @@ -38,11 +38,10 @@ const Actions = (props: ActionsProps) => { onClose={handleClose} placement='bottom-end' > - + - - + diff --git a/src/components/daily/Daily/index.tsx b/src/components/daily/Daily/index.tsx index 46ddecd..ee2ddc8 100644 --- a/src/components/daily/Daily/index.tsx +++ b/src/components/daily/Daily/index.tsx @@ -40,17 +40,17 @@ const Daily = (props: DailyProps) => { diff --git a/src/components/daily/DailyInputDialog/TaskInput/index.tsx b/src/components/daily/DailyInputDialog/TaskInput/index.tsx index e704090..b41da24 100644 --- a/src/components/daily/DailyInputDialog/TaskInput/index.tsx +++ b/src/components/daily/DailyInputDialog/TaskInput/index.tsx @@ -21,12 +21,8 @@ const TaskInput = (props: TaskInputProps) => { {t(`daily.${title}`)} @@ -41,9 +37,6 @@ const TaskInput = (props: TaskInputProps) => {