瀏覽代碼

update

master
cyril.tsui 1 年之前
父節點
當前提交
bda00aaf99
共有 5 個文件被更改,包括 24 次插入9 次删除
  1. +15
    -2
      src/assets/style/styles.css
  2. +1
    -0
      src/index.js
  3. +3
    -3
      src/pages/Proof/Search_GLD/SearchForm.js
  4. +4
    -3
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
  5. +1
    -1
      src/themes/index.js

+ 15
- 2
src/assets/style/styles.css 查看文件

@@ -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;
font-family: 微軟正黑體;
}
} */
/* main{
padding-top: 43px;
} */

+ 1
- 0
src/index.js 查看文件

@@ -1,6 +1,7 @@
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import "./assets/style/styles.css"

// scroll bar
import 'simplebar/src/simplebar.css';


+ 3
- 3
src/pages/Proof/Search_GLD/SearchForm.js 查看文件

@@ -91,7 +91,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
>

<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*/}
<CardContent sx={{ px: 2.5, pt: 3 }}>
@@ -282,7 +282,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
{/*last row*/}
<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
size="large"
variant="contained"
@@ -295,7 +295,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
</Button>
</Grid>

<Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
<Grid item sx={{ ml: 3, mb: 3, mt: 3 }}>
<Button
size="large"
variant="contained"


+ 4
- 3
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js 查看文件

@@ -137,12 +137,13 @@ const ApplicationDetailCard = (
variant="contained"
onClick={cancelledClick()}
disabled={currentApplicationDetailData.status !== "submitted"}
title={"取消"}
sx={{
textTransform: 'capitalize',
alignItems: 'end',
backgroundColor: '#ffa733'
}}>
<CloseIcon />
<CloseIcon sx={{mb:0.5}}/>
<Typography ml={1} variant="h5"> 取消</Typography>
</Button>
</Stack>
@@ -493,7 +494,6 @@ const ApplicationDetailCard = (
</Grid>
<Grid item md={4} lg={4}>
<Button
size="small"
variant="contained"
onClick={onDownloadClick()}
title="下載"
@@ -502,7 +502,8 @@ const ApplicationDetailCard = (
textTransform: 'capitalize',
alignItems: 'end',
}}>
<DownloadIcon />
<DownloadIcon sx={{mb: 0.5}}/>
<Typography sx={{ml: 1}} variant="h5">下載</Typography>
</Button>
</Grid>
</Grid>


+ 1
- 1
src/themes/index.js 查看文件

@@ -17,7 +17,7 @@ export default function ThemeCustomization({ children }) {
const theme = Palette('light', 'default');

// eslint-disable-next-line react-hooks/exhaustive-deps
const themeTypography = Typography(`微軟正黑體`);
const themeTypography = Typography(``);
const themeCustomShadows = useMemo(() => CustomShadows(theme), [theme]);

const themeOptions = useMemo(


Loading…
取消
儲存