Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/pages/Setting/SystemSetting/Form.js

@@ -120,8 +120,8 @@ const Form = ({ selectedItem, onSave }) => {
                                                             error={valueErr}
                                                             onChange={(event) => {
                                                                 setValue(event.target.value);
-                                                                if (event.target.value.length >= 1000) {
-                                                                    setValueErr("The number of characters cannot exceed 1000 words.");
+                                                                if (event.target.value.length >= 5000) {
+                                                                    setValueErr("The number of characters cannot exceed 5000 words.");
                                                                     return;
                                                                 }
                                                                 setValueErr("");

src/pages/authentication/auth-forms/BusCustomFormWizard.js

@@ -1365,7 +1365,7 @@ const BusCustomFormWizard = (props) => {
                                         <Grid container>
                                             <Grid item xs={12} md={12}>
                                                 <Typography variant="h6" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#0C489E" }}>
-                                                <div dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
+                                                <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
                                                 </Typography>
                                             </Grid>
                                         </Grid>

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -1554,7 +1554,7 @@ const CustomFormWizard = (props) => {
                                         <Grid container>
                                             <Grid item xs={12} md={12}>
                                                 <Typography variant="h6" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#0C489E" }}>
-                                                <div dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
+                                                <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
                                                 </Typography>
                                             </Grid>
                                         </Grid>

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -827,7 +827,7 @@ const CustomFormWizard = (props) => {
                                             <Grid item xs={12} md={12}>
                                                 <Typography variant="h5" height="80%" sx={{ textAlign: "left", overflow: "scroll", borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#0C489E" }}>
                                                     
-                                                    <div dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
+                                                    <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
                                                 </Typography>
                                             </Grid>
                                         </Grid>