From 691fc31786f323329b25042ba72b088c5eca5094 Mon Sep 17 00:00:00 2001
From: "jason.lam" <jason.lam@2fi-solutions.com.hk>
Date: Thu, 4 Jan 2024 11:03:27 +0800
Subject: [PATCH] update layout

---
 src/layout/MainLayout/Header/index.js            | 15 ++++++++++++---
 src/layout/MainLayout/index.js                   |  2 +-
 src/pages/PublicNotice/Search_GLD/index.js       |  2 +-
 .../auth-forms/CustomFormWizard.js               | 16 ++++++++--------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index 93cb15e..749945e 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -369,9 +369,18 @@ function Header(props) {
               >
                 <MenuIcon style={{ color: '#0C489E' }} />
               </IconButton>
-              <Box sx={{ mr: 2, display: { sm: 'none' } }}>
-                <MobileLogo />
-                <span id="mobileTitle" >公共啟事提交及繳費系統</span>
+              <Box sx={{ flexGrow: 1, mr: 2, display: { xs: 'block', sm: 'none' } }}>
+
+                <Stack direction="row" justifyContent="space-between" alignItems="center">
+                  <MobileLogo />
+                  <Stack justifyContent="flex-start" alignItems="center">
+                    <span id="mobileTitle">公共啟事提交及繳費系統</span>
+                  </Stack>
+
+                  <Stack justifyContent="flex-end" alignItems="center">
+                    <LocaleSelector />
+                  </Stack>
+                </Stack>
               </Box>
             </Stack>
             <Box sx={{ display: { xs: 'none', sm: 'block' }, width: "75%" }}>
diff --git a/src/layout/MainLayout/index.js b/src/layout/MainLayout/index.js
index bba7653..ee6a6c7 100644
--- a/src/layout/MainLayout/index.js
+++ b/src/layout/MainLayout/index.js
@@ -58,7 +58,7 @@ const MainLayout = () => {
     <Box sx={{backgroundColor:'#ffffff', display: 'flex', width: '100%', flexDirection: "column", paddingTop: { xs: "5px", sm: "43px" }}}>
       <Header/>
       {/* <Drawer open={open} handleDrawerToggle={handleDrawerToggle} /> */}
-      <Box style={{ width: '100%', flexGrow: 1 } } sx={{ paddingTop: "50px" }}>
+      <Box style={{ width: '100%', flexGrow: 1 } } sx={{ paddingTop: "38px" }}>
         {/* <Toolbar /> */}
         {/* <Breadcrumbs navigation={navigation} title /> */}
         <Outlet />
diff --git a/src/pages/PublicNotice/Search_GLD/index.js b/src/pages/PublicNotice/Search_GLD/index.js
index 236b99d..31059f6 100644
--- a/src/pages/PublicNotice/Search_GLD/index.js
+++ b/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}>
+                <Grid item xs={12} md={12} lg={12} sx={{mb: -4}}>
                     <SearchForm
                         applySearch={applySearch}
                         orgComboData={orgCombo}
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index 956c6f9..f3855c8 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -676,13 +676,13 @@ const CustomFormWizard = (props) => {
                                         <InputLabel htmlFor="username-signup">
                                             <Typography variant="pnspsFormHeader">
                                                 用戶登入名稱
-                                                {/* <span style={{ color: '#f10000' }}>*</span>
-                                                <Button
-                                                    variant="contained"
-                                                    onClick={handleCheckUsername}
-                                                    sx={{ ml: 2, height: "40px" }}>
-                                                    <Typography variant="h6">檢查是否重覆</Typography>
-                                                </Button> */}
+                                                <span style={{ color: '#f10000' }}>*</span>
+                                                {/*<Button*/}
+                                                {/*    variant="contained"*/}
+                                                {/*    onClick={handleCheckUsername}*/}
+                                                {/*    sx={{ ml: 2, height: "40px" }}>*/}
+                                                {/*    <Typography variant="h6">檢查是否重覆</Typography>*/}
+                                                {/*</Button> **/}
                                             </Typography>
                                         </InputLabel>
                                         <OutlinedInput
@@ -1461,7 +1461,7 @@ const CustomFormWizard = (props) => {
                                                         />
                                                     </Button>
                                                     </ThemeProvider>
-                                                    <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}>如: 香港身份證; 護照; 中國內地身份證等</Typography>
+                                                    {/*<Typography xs={12} sm={9} md={3} display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}>如: 香港身份證; 護照; 中國內地身份證等</Typography>*/}
                                                 </Stack>
                                                 {fileList != null ?
                                                     <UploadFileTable key="uploadTable" recordList={fileListData} setUpdateRows={setUpdateRows} /> : null}