Merge branch 'archis-dev' of yadneshgharat.gitlab.com:arjunpanwar85/reception_frontend_ui into yadnesh-dev

Author: yadneshgharat

src/features/SalesAndOrganisation/CheckInPointsView.tsx

@@ -19,7 +19,7 @@ const useStyles = makeStyles((theme: Theme) =>
         paper: {
             backgroundColor: '#E7ECF6',
             borderRadius: theme.shape.borderRadius - 5,
-            marginRight: 30,
+            // marginRight: 30,
             paddingRight: 150
         },
     })
@@ -85,7 +85,7 @@ const CheckInPointsView: FunctionComponent<Props> = (props) => {
     }, [dispatch])
 
     return (
-        <Grid item xs style={{height: "100%"}}>
+        <Grid item xs={12} style={{ marginRight: 30}}>
             <Paper className={classes.paper}>
                 <Box display="flex" justifyContent="space-between" style={{ paddingTop: '37px', paddingLeft: '30px', paddingBottom: '25.5px'}} >
                     <SearchInput hidden placeholder="Search Employees by name, email or mobile" width={353} />

src/features/SalesAndOrganisation/SiteForm.tsx

@@ -103,7 +103,7 @@ const SiteForm: FunctionComponent<Props> = (props) => {
 
 
     return (
-        <Grid item style={{ height: '80%', width: '90%' }}>
+        <Grid item xs={12} style={{ marginRight: 30 }}>
             <Paper className={classes.paper}>
                 <form onSubmit={handleSubmit}>
                     <div className={classes.header}>

src/features/SalesAndOrganisation/SitesView.tsx

@@ -19,7 +19,7 @@ const useStyles = makeStyles((theme: Theme) =>
         paper: {
             backgroundColor: '#E7ECF6',
             borderRadius: theme.shape.borderRadius - 5,
-            marginRight: 30,
+            // marginRight: 30,
             paddingRight: 150
         },
     })
@@ -99,7 +99,7 @@ const SitesView: FunctionComponent<Props> = (props) => {
     }, [dispatch])
 
     return (
-        <Grid item xs style={{ height: "100%", marginTop: '22px' }}>
+        <Grid item xs={12} style={{ marginRight: '30px' }}>
             <Paper className={classes.paper}>
                 <Box display="flex" justifyContent="space-between" style={{ paddingTop: '38px', paddingBottom: '26px' }}>
                     <SearchInput placeholder="Search Employees by name, email or mobile" width={354} style={{ paddingLeft: '30px' }} />

src/features/Settings/DeviceForm.tsx

@@ -140,7 +140,7 @@ const DeviceForm: FunctionComponent<Props> = (props) => {
 
 
     return (
-        <Grid item style={{ height: '80%', width: '90%' }}>
+        <Grid item xs={12} style={{ marginRight: 30 }}>
             <Paper className={classes.paper}>
                 <form onSubmit={handleSubmit}>
                     <div className={classes.header}>

src/features/UserManagement/UserManagementView.tsx

@@ -18,8 +18,8 @@ const useStyles = makeStyles((theme: Theme) =>
             backgroundColor: '#E7ECF6',
             height: '100%',
             borderRadius: theme.shape.borderRadius - 5,
-            marginRight: 30,
-            paddingRight: 200,
+            // marginRight: 30,
+            // paddingRight: 200,
 
             '&  .MuiTableCell-root': {
                 borderBottom: '1px solid #192949',
@@ -114,7 +114,7 @@ const UserManagementView: FunctionComponent<Props> = (props) => {
     }
 
     return (
-        <Grid item xs style={{height: "100%"}}>
+        <Grid item xs={12} style={{ marginRight: 30 }}>
             <Paper className={classes.paper}>
                 <div className={classes.header}>
                     <ArrowBackIos className={classes.arrowBack} onClick={() => props.history.push('/')}/>