From 747ba4409686560efaf6c84a790f618947d45d82 Mon Sep 17 00:00:00 2001 From: Dignesh Gujarathi Date: Fri, 4 Sep 2020 18:58:38 +0530 Subject: [PATCH 1/3] UI Fixes --- src/components/UI/DialogBox/DialogBox.module.css | 4 ++++ src/components/UI/Form/PhoneInput/PhoneInput.module.css | 1 - .../UI/Layout/Navigation/SideDrawer/SideDrawer.tsx | 2 -- src/containers/Auth/Auth.module.css | 1 + src/containers/List/ListCard/ListCard.module.css | 4 ++-- src/containers/Template/List/Template.module.css | 6 +++--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/UI/DialogBox/DialogBox.module.css b/src/components/UI/DialogBox/DialogBox.module.css index a95cae230..8b20283df 100644 --- a/src/components/UI/DialogBox/DialogBox.module.css +++ b/src/components/UI/DialogBox/DialogBox.module.css @@ -15,6 +15,10 @@ height: unset !important; } +.Dialogbox Form { + max-height: 500px; +} + .DialogActions { padding-left: 24px !important; padding-bottom: 24px !important; diff --git a/src/components/UI/Form/PhoneInput/PhoneInput.module.css b/src/components/UI/Form/PhoneInput/PhoneInput.module.css index d2789d47d..070db756f 100644 --- a/src/components/UI/Form/PhoneInput/PhoneInput.module.css +++ b/src/components/UI/Form/PhoneInput/PhoneInput.module.css @@ -19,6 +19,5 @@ .FormHelperText { color: red !important; margin-top: 2px !important; - margin-left: 14px !important; line-height: 1.2 !important; } diff --git a/src/components/UI/Layout/Navigation/SideDrawer/SideDrawer.tsx b/src/components/UI/Layout/Navigation/SideDrawer/SideDrawer.tsx index 91571d821..0a9c47dd6 100644 --- a/src/components/UI/Layout/Navigation/SideDrawer/SideDrawer.tsx +++ b/src/components/UI/Layout/Navigation/SideDrawer/SideDrawer.tsx @@ -5,7 +5,6 @@ import { makeStyles, createStyles, Theme, - Divider, Toolbar, Typography, } from '@material-ui/core'; @@ -140,7 +139,6 @@ export const SideDrawer: React.SFC = (props) => { )} - ); diff --git a/src/containers/Auth/Auth.module.css b/src/containers/Auth/Auth.module.css index f2380a8c1..3f97d33c3 100644 --- a/src/containers/Auth/Auth.module.css +++ b/src/containers/Auth/Auth.module.css @@ -157,6 +157,7 @@ .AuthButton { width: 334px; + margin-right: 0px !important; } .ErrorMessage { diff --git a/src/containers/List/ListCard/ListCard.module.css b/src/containers/List/ListCard/ListCard.module.css index cfc0bccc9..b5031b525 100644 --- a/src/containers/List/ListCard/ListCard.module.css +++ b/src/containers/List/ListCard/ListCard.module.css @@ -1,5 +1,5 @@ .Card { - width: 310px; + width: 31%; position: relative !important; margin-right: 24px; margin-bottom: 24px; @@ -32,7 +32,7 @@ .CardActions { position: absolute !important; - width: inherit; + width: 100%; bottom: 0px !important; } diff --git a/src/containers/Template/List/Template.module.css b/src/containers/Template/List/Template.module.css index 54cb08493..40f18c37f 100644 --- a/src/containers/Template/List/Template.module.css +++ b/src/containers/Template/List/Template.module.css @@ -1,13 +1,13 @@ .Label { - width: 235px; + width: 25%; } .Body { - width: 600px; + width: 50%; } .Actions { - width: 100px; + width: 25%; justify-content: flex-end; margin-left: auto; } From 8c65d8b35e9ef345a07abeb8a1337bfa4f6a8679 Mon Sep 17 00:00:00 2001 From: Kurund Jalmi Date: Fri, 4 Sep 2020 20:17:42 +0530 Subject: [PATCH 2/3] staff action fixes --- .../StaffManagementList/StaffManagementList.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/StaffManagement/StaffManagementList/StaffManagementList.module.css b/src/containers/StaffManagement/StaffManagementList/StaffManagementList.module.css index c1599dc29..c94dc2e9b 100644 --- a/src/containers/StaffManagement/StaffManagementList/StaffManagementList.module.css +++ b/src/containers/StaffManagement/StaffManagementList/StaffManagementList.module.css @@ -50,7 +50,7 @@ } .Actions { - width: 130px; + width: 150px; justify-content: flex-end; margin-left: auto; } From 681b540eabfb09f58a2f252296474e25726dae1b Mon Sep 17 00:00:00 2001 From: Kurund Jalmi Date: Sat, 5 Sep 2020 00:25:53 +0530 Subject: [PATCH 3/3] staff listing fixes --- .../StaffManagement/StaffManagementList/StaffManagementList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/StaffManagement/StaffManagementList/StaffManagementList.tsx b/src/containers/StaffManagement/StaffManagementList/StaffManagementList.tsx index aaef46e7e..fc85ad9c3 100644 --- a/src/containers/StaffManagement/StaffManagementList/StaffManagementList.tsx +++ b/src/containers/StaffManagement/StaffManagementList/StaffManagementList.tsx @@ -9,7 +9,7 @@ import { List } from '../../List/List'; export interface StaffManagementProps {} export const StaffManagementList: React.SFC = () => { - const columnNames = ['NAME', 'PHONE NO.', 'GROUPS', 'ACTIONS']; + const columnNames = ['NAME', 'PHONE NO.', 'ASSIGNED TO', 'ACTIONS']; const columnStyles = [styles.Name, styles.Phone, styles.Group, styles.Actions]; const staffIcon = ;