@@ -1,7 +1,20 @@ | |||||
body{ | |||||
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+HK|Noto+Sans+SC&display=swap'); | |||||
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+SC&display=swap'); | |||||
html, | |||||
body, | |||||
#root, | |||||
.app, | |||||
.content { | |||||
height: 100%; | |||||
width: 100%; | |||||
font-family: "Noto Sans HK", "Noto Sans SC"; | |||||
} | |||||
/* body{ | |||||
padding-top: 53px; | padding-top: 53px; | ||||
font-family: 微軟正黑體; | font-family: 微軟正黑體; | ||||
} | |||||
} */ | |||||
/* main{ | /* main{ | ||||
padding-top: 43px; | padding-top: 43px; | ||||
} */ | } */ |
@@ -1,6 +1,7 @@ | |||||
import { StrictMode } from 'react'; | import { StrictMode } from 'react'; | ||||
import { createRoot } from 'react-dom/client'; | import { createRoot } from 'react-dom/client'; | ||||
import { BrowserRouter } from 'react-router-dom'; | import { BrowserRouter } from 'react-router-dom'; | ||||
import "./assets/style/styles.css" | |||||
// scroll bar | // scroll bar | ||||
import 'simplebar/src/simplebar.css'; | import 'simplebar/src/simplebar.css'; | ||||
@@ -91,7 +91,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
> | > | ||||
<form onSubmit={handleSubmit(onSubmit)}> | <form onSubmit={handleSubmit(onSubmit)}> | ||||
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 3, mb: 3 }} width="98%"> | |||||
<Grid container sx={{ backgroundColor: '#ffffff', ml: 2 }} width="98%"> | |||||
{/*row 1*/} | {/*row 1*/} | ||||
<CardContent sx={{ px: 2.5, pt: 3 }}> | <CardContent sx={{ px: 2.5, pt: 3 }}> | ||||
@@ -282,7 +282,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
{/*last row*/} | {/*last row*/} | ||||
<Grid container maxWidth justifyContent="flex-end"> | <Grid container maxWidth justifyContent="flex-end"> | ||||
<Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}> | |||||
<Grid item sx={{ ml: 3, mb: 3, mt: 3 }}> | |||||
<Button | <Button | ||||
size="large" | size="large" | ||||
variant="contained" | variant="contained" | ||||
@@ -295,7 +295,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss | |||||
</Button> | </Button> | ||||
</Grid> | </Grid> | ||||
<Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}> | |||||
<Grid item sx={{ ml: 3, mb: 3, mt: 3 }}> | |||||
<Button | <Button | ||||
size="large" | size="large" | ||||
variant="contained" | variant="contained" | ||||
@@ -137,12 +137,13 @@ const ApplicationDetailCard = ( | |||||
variant="contained" | variant="contained" | ||||
onClick={cancelledClick()} | onClick={cancelledClick()} | ||||
disabled={currentApplicationDetailData.status !== "submitted"} | disabled={currentApplicationDetailData.status !== "submitted"} | ||||
title={"取消"} | |||||
sx={{ | sx={{ | ||||
textTransform: 'capitalize', | textTransform: 'capitalize', | ||||
alignItems: 'end', | alignItems: 'end', | ||||
backgroundColor: '#ffa733' | backgroundColor: '#ffa733' | ||||
}}> | }}> | ||||
<CloseIcon /> | |||||
<CloseIcon sx={{mb:0.5}}/> | |||||
<Typography ml={1} variant="h5"> 取消</Typography> | <Typography ml={1} variant="h5"> 取消</Typography> | ||||
</Button> | </Button> | ||||
</Stack> | </Stack> | ||||
@@ -493,7 +494,6 @@ const ApplicationDetailCard = ( | |||||
</Grid> | </Grid> | ||||
<Grid item md={4} lg={4}> | <Grid item md={4} lg={4}> | ||||
<Button | <Button | ||||
size="small" | |||||
variant="contained" | variant="contained" | ||||
onClick={onDownloadClick()} | onClick={onDownloadClick()} | ||||
title="下載" | title="下載" | ||||
@@ -502,7 +502,8 @@ const ApplicationDetailCard = ( | |||||
textTransform: 'capitalize', | textTransform: 'capitalize', | ||||
alignItems: 'end', | alignItems: 'end', | ||||
}}> | }}> | ||||
<DownloadIcon /> | |||||
<DownloadIcon sx={{mb: 0.5}}/> | |||||
<Typography sx={{ml: 1}} variant="h5">下載</Typography> | |||||
</Button> | </Button> | ||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
@@ -17,7 +17,7 @@ export default function ThemeCustomization({ children }) { | |||||
const theme = Palette('light', 'default'); | const theme = Palette('light', 'default'); | ||||
// eslint-disable-next-line react-hooks/exhaustive-deps | // eslint-disable-next-line react-hooks/exhaustive-deps | ||||
const themeTypography = Typography(`微軟正黑體`); | |||||
const themeTypography = Typography(``); | |||||
const themeCustomShadows = useMemo(() => CustomShadows(theme), [theme]); | const themeCustomShadows = useMemo(() => CustomShadows(theme), [theme]); | ||||
const themeOptions = useMemo( | const themeOptions = useMemo( | ||||