update layout

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -168,8 +168,9 @@ const ApplicationDetailCard = (
                                 color="edit"
                                 disabled={currentApplicationDetailData.status !== "submitted"}
                                 title={"取消"}
+                                startIcon={<CloseIcon />}
                             >
-                                <CloseIcon sx={{mr:1}} />
+
                                 取消
                             </Button>
                             </ThemeProvider>
@@ -526,8 +527,8 @@ const ApplicationDetailCard = (
                                                                 onClick={onDownloadClick()}
                                                                 title="下載"
                                                                 color="save"
+                                                                startIcon={<DownloadIcon sx={{alignItems:"center"}}/>}
                                                             >
-                                                                <DownloadIcon sx={{ mr:1 }} />
                                                                 下載
                                                             </Button>
                                                             </ThemeProvider>

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -19,7 +19,8 @@ import { useNavigate } from "react-router-dom";
 import {
     isORGLoggedIn,
 } from "utils/Utils";
-import {useTheme} from "@emotion/react";
+import {ThemeProvider, useTheme} from "@emotion/react";
+import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function SubmittedTab({ rows }) {
@@ -306,14 +307,34 @@ export default function SubmittedTab({ rows }) {
                     onRowDoubleClick={handleRowDoubleClick}
                     getRowHeight={() => 'auto'}
                 />
-                <br />
-                <Button variant="contained" onClick={() => { handlePaymentBtn() }}><Typography variant="h5">付款</Typography></Button>
+
+                <ThemeProvider theme={PNSPS_BUTTON_THEME}>
+                <Button
+                    color="create"
+                    variant="contained"
+                    onClick={() => { handlePaymentBtn() }}
+                    sx={{mt:2, ml:1}}
+                >
+                    付款
+                </Button>
+                </ThemeProvider>
             </div>
 
             <div>
-                <Dialog open={isPopUp} onClose={() => setIsPopUp(false)}  >
-                    <DialogTitle></DialogTitle>
-                    <Typography variant="h2" style={{ padding: '16px' }}>確認付款</Typography>
+                <Dialog
+                    open={isPopUp}
+                    onClose={() => setIsPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '30vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '50vh' }
+                        }
+                    }}
+                >
+                    <DialogTitle>
+                        <Typography variant="h3" >確認付款</Typography>
+                    </DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Stack direction="column" justifyContent="space-between">
                             {getWindowContent()}

src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js

@@ -47,17 +47,18 @@ const UserSearchPage_Individual = () => {
     return (
         <Grid container>
             {/*row 1*/}
-            <Grid item xs={12} md={12} lg={12} sx={{mb:-4}}>
+            <Grid item xs={12} md={12} lg={12} sx={{mb:-3}}>
                 <SearchForm 
                 applySearch={applySearch}
                 searchCriteria={searchCriteria}
                 />
             </Grid>
             {/*row 2*/}
-            <Grid item xs={12} md={12} lg={12}>
+            <Grid item xs={12} md={12} lg={12} >
                 <MainCard elevation={0}
                           border={false}
                           content={false}
+                          sx={{width: "-webkit-fill-available"}}
                 >
                     <EventTable
                         recordList={record}

src/pages/PublicNotice/ListPanel/index.js

@@ -114,7 +114,9 @@ const PublicNotice = () => {
                     <Stack direction="row" justifyContent="flex-end" alignItems="center">
                         <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
                         <Box sx={{ mr: { md: "47px" } }}>
-                            <Button variant="contained" onClick={() => { onBtnClick() }}><Typography variant="pnspsButtonText">申請公共啟事</Typography></Button>
+                            <Button variant="contained" onClick={() => { onBtnClick() }}>
+                                申請公共啟事
+                            </Button>
                         </Box>
                         </ThemeProvider>
                     </Stack>

src/themes/buttonConst.js

@@ -52,6 +52,14 @@ export const PNSPS_BUTTON_THEME = createTheme({
         },
         MuiButton: {
             styleOverrides: {
+                startIcon:{
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    '& > *:nth-of-type(1)': {
+                        fontSize: '28px',
+                    },
+                },
                 root: {
                     fontSize: '1.2rem',
                     fontWeight: '600',
@@ -67,9 +75,7 @@ export const PNSPS_BUTTON_THEME = createTheme({
                         width: '9vw',
                     },
                     textTransform: "none",
-                    display: 'flex',
-                    alignItems: 'center',
-                    justifyContent: 'center',
+                    alignItems: 'normal',
                 },
             },
         },
@@ -128,6 +134,14 @@ export const PNSPS_LONG_BUTTON_THEME = createTheme({
         },
         MuiButton: {
             styleOverrides: {
+                startIcon:{
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    '& > *:nth-of-type(1)': {
+                        fontSize: '28px',
+                    },
+                },
                 root: {
                     fontSize: '1.2rem',
                     fontWeight: '600',
@@ -143,9 +157,7 @@ export const PNSPS_LONG_BUTTON_THEME = createTheme({
                         width: '16vw',
                     },
                     textTransform: "none",
-                    display: 'flex',
-                    alignItems: 'center',
-                    justifyContent: 'center',
+                    alignItems: 'normal',
                 },
             },
         },