@@ -27,7 +27,7 @@ export default async function MainLayout({ | |||||
<Box | <Box | ||||
component="main" | component="main" | ||||
sx={{ | sx={{ | ||||
marginInlineStart: { xs: 0, lg: NAVIGATION_CONTENT_WIDTH }, | |||||
marginInlineStart: { xs: 0, xl: NAVIGATION_CONTENT_WIDTH }, | |||||
padding: { xs: "1rem", sm: "1.5rem", lg: "3rem" }, | padding: { xs: "1rem", sm: "1.5rem", lg: "3rem" }, | ||||
}} | }} | ||||
> | > | ||||
@@ -1,6 +1,5 @@ | |||||
import { preloadProjects } from "@/app/api/projects"; | import { preloadProjects } from "@/app/api/projects"; | ||||
import ProjectSearch from "@/components/ProjectSearch"; | import ProjectSearch from "@/components/ProjectSearch"; | ||||
import ProgressByClientSearch from "@/components/ProgressByClientSearch"; | |||||
import { getServerI18n } from "@/i18n"; | import { getServerI18n } from "@/i18n"; | ||||
import Add from "@mui/icons-material/Add"; | import Add from "@mui/icons-material/Add"; | ||||
import Button from "@mui/material/Button"; | import Button from "@mui/material/Button"; | ||||
@@ -18,7 +18,7 @@ const NavigationToggle: React.FC = () => { | |||||
return ( | return ( | ||||
<> | <> | ||||
<Drawer variant="permanent" sx={{ display: { xs: "none", xl: "block" } }}> | <Drawer variant="permanent" sx={{ display: { xs: "none", xl: "block" } }}> | ||||
<NavigationContent/> | |||||
<NavigationContent /> | |||||
</Drawer> | </Drawer> | ||||
<Drawer | <Drawer | ||||
sx={{ display: { xl: "none" } }} | sx={{ display: { xl: "none" } }} | ||||
@@ -28,7 +28,7 @@ const NavigationToggle: React.FC = () => { | |||||
keepMounted: true, | keepMounted: true, | ||||
}} | }} | ||||
> | > | ||||
<NavigationContent/> | |||||
<NavigationContent /> | |||||
</Drawer> | </Drawer> | ||||
<IconButton | <IconButton | ||||
sx={{ display: { xl: "none" } }} | sx={{ display: { xl: "none" } }} | ||||
@@ -83,7 +83,7 @@ function SearchBox<T extends string>({ | |||||
return ( | return ( | ||||
<Card> | <Card> | ||||
<CardContent sx={{ display: "flex", flexDirection: "column", gap: 1 }}> | <CardContent sx={{ display: "flex", flexDirection: "column", gap: 1 }}> | ||||
<Typography variant="overline" style={{fontWeight:"600"}}>{t("Search Criteria")}</Typography> | |||||
<Typography variant="overline">{t("Search Criteria")}</Typography> | |||||
<Grid container spacing={2} columns={{ xs: 6, sm: 12 }}> | <Grid container spacing={2} columns={{ xs: 6, sm: 12 }}> | ||||
{criteria.map((c) => { | {criteria.map((c) => { | ||||
return ( | return ( | ||||
@@ -189,7 +189,7 @@ const components: ThemeOptions["components"] = { | |||||
}, | }, | ||||
[`&.Mui-focused`]: { | [`&.Mui-focused`]: { | ||||
backgroundColor: "transparent", | backgroundColor: "transparent", | ||||
borderColor: "palette.primary.main", | |||||
borderColor: palette.primary.main, | |||||
boxShadow: `${palette.primary.main} 0 0 0 2px`, | boxShadow: `${palette.primary.main} 0 0 0 2px`, | ||||
}, | }, | ||||
[`&.Mui-error`]: { | [`&.Mui-error`]: { | ||||
@@ -216,7 +216,7 @@ const components: ThemeOptions["components"] = { | |||||
[`&.Mui-focused`]: { | [`&.Mui-focused`]: { | ||||
backgroundColor: "transparent", | backgroundColor: "transparent", | ||||
[`& .MuiOutlinedInput-notchedOutline`]: { | [`& .MuiOutlinedInput-notchedOutline`]: { | ||||
borderColor: "palette.primary.main", | |||||
borderColor: palette.primary.main, | |||||
boxShadow: `${palette.primary.main} 0 0 0 2px`, | boxShadow: `${palette.primary.main} 0 0 0 2px`, | ||||
}, | }, | ||||
}, | }, | ||||