update layout

src/pages/Payment/Search_GLD/SearchForm.js

@@ -1,7 +1,6 @@
 // material-ui
 import {
     Button,
-    CardContent,
     Grid, TextField,
     Autocomplete,
     Typography
@@ -63,11 +62,12 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
 
             <form onSubmit={handleSubmit(onSubmit)}>
                 {/*row 1*/}
-                <CardContent sx={{ px: 2.5, pt: 3 }}>
-                    <Grid item justifyContent="space-between" alignItems="center" >
-                        <Typography variant="h5">Search</Typography>
-                    </Grid>
-                </CardContent>
+                <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
+                    <Typography variant="h5" >
+                        Search Form
+                    </Typography>
+                </Grid>
+
 
                 {/*row 2*/}
                 <Grid container alignItems={"center"}>

src/pages/Proof/Search_GLD/SearchForm.js

@@ -1,7 +1,6 @@
 // material-ui
 import {
     Button,
-    CardContent,
     Grid, TextField,
     Autocomplete
 } from '@mui/material';
@@ -12,6 +11,8 @@ import * as ComboData from "utils/ComboData";
 import * as DateUtils from "utils/DateUtils";
 import * as FormatUtils from "utils/FormatUtils";
 import { Typography } from '../../../../node_modules/@mui/material/index';
+import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
+import {ThemeProvider} from "@emotion/react";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
@@ -91,16 +92,14 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
         >
 
             <form onSubmit={handleSubmit(onSubmit)}>
-                <Grid container sx={{ backgroundColor: '#ffffff', ml: 2 }} width="98%">
+                <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1 }} width="98%">
 
                     {/*row 1*/}
-                    <CardContent sx={{ px: 2.5, pt: 3 }}>
-                        <Grid item justifyContent="space-between" alignItems="center">
-                            <Typography variant="h5">
-                                Search Form
-                            </Typography>
-                        </Grid>
-                    </CardContent>
+                    <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
+                        <Typography variant="h5" >
+                            Search Form
+                        </Typography>
+                    </Grid>
 
                     {/*row 2*/}
                     <Grid container alignItems={"center"}>
@@ -287,32 +286,25 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
 
                     {/*last row*/}
                     <Grid container maxWidth justifyContent="flex-end">
-
-                        <Grid item sx={{ ml: 3, mb: 3, mt: 3 }}>
+                        <ThemeProvider theme={PNSPS_BUTTON_THEME}>
+                        <Grid item sx={{ ml: 3, mb: 3 }}>
                             <Button
-                                size="large"
                                 variant="contained"
                                 onClick={resetForm}
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}>
-                                <Typography variant="h5">Clear</Typography>
+                                >
+                                Clear
                             </Button>
                         </Grid>
 
-                        <Grid item sx={{ ml: 3, mb: 3, mt: 3 }}>
+                        <Grid item sx={{ ml: 3, mb: 3 }}>
                             <Button
-                                size="large"
                                 variant="contained"
                                 type="submit"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}>
-                                <Typography variant="h5">Submit</Typography>
+                               >
+                                Submit
                             </Button>
                         </Grid>
+                        </ThemeProvider>
                     </Grid>
                 </Grid>
             </form>

src/pages/Proof/Search_GLD/index.js

@@ -102,7 +102,7 @@ const UserSearchPage_Individual = () => {
                     </div>
                 </Grid>
                 {/*row 1*/}
-                <Grid item xs={12} md={12} lg={12}>
+                <Grid item xs={12} md={12} lg={12} sx={{mb:-1}}>
                     <SearchForm
                         applySearch={applySearch}
                         orgComboData={orgCombo}

src/pages/PublicNotice/Search_GLD/SearchForm.js

@@ -301,7 +301,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                     {/*last row*/}
                     <Grid container maxWidth justifyContent="flex-end">
                         <ThemeProvider theme={PNSPS_BUTTON_THEME}>
-                        <Grid item sx={{ ml: 3, mr: 3 }}>
+                        <Grid item sx={{ ml: 3 }}>
                             <Button
                                 variant="contained"
                                 onClick={resetForm}
@@ -310,7 +310,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                             </Button>
                         </Grid>
 
-                        <Grid item sx={{ ml: 3, mr: 3 }}>
+                        <Grid item sx={{ ml: 3 }}>
                             <Button
                                 variant="contained"
                                 type="submit"

src/pages/PublicNotice/Search_GLD/index.js

@@ -101,7 +101,7 @@ const UserSearchPage_Individual = () => {
                     </div>
                 </Grid>
                 {/*row 1*/}
-                <Grid item xs={12} md={12} lg={12} sx={{mb: -4}}>
+                <Grid item xs={12} md={12} lg={12} sx={{mb: -1}}>
                     <SearchForm
                         applySearch={applySearch}
                         orgComboData={orgCombo}