Skip to content

Commit

Permalink
Merge pull request #433 from glific/UI-fixes-415
Browse files Browse the repository at this point in the history
UI Fixes
  • Loading branch information
kurund authored Sep 4, 2020
2 parents 28a8e2f + 681b540 commit 581772c
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
4 changes: 4 additions & 0 deletions src/components/UI/DialogBox/DialogBox.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
height: unset !important;
}

.Dialogbox Form {
max-height: 500px;
}

.DialogActions {
padding-left: 24px !important;
padding-bottom: 24px !important;
Expand Down
1 change: 0 additions & 1 deletion src/components/UI/Form/PhoneInput/PhoneInput.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
.FormHelperText {
color: red !important;
margin-top: 2px !important;
margin-left: 14px !important;
line-height: 1.2 !important;
}
2 changes: 0 additions & 2 deletions src/components/UI/Layout/Navigation/SideDrawer/SideDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
makeStyles,
createStyles,
Theme,
Divider,
Toolbar,
Typography,
} from '@material-ui/core';
Expand Down Expand Up @@ -140,7 +139,6 @@ export const SideDrawer: React.SFC<SideDrawerProps> = (props) => {
</IconButton>
)}
</Toolbar>
<Divider />
<SideMenus opened={fullOpen} />
</div>
);
Expand Down
1 change: 1 addition & 0 deletions src/containers/Auth/Auth.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@

.AuthButton {
width: 334px;
margin-right: 0px !important;
}

.ErrorMessage {
Expand Down
4 changes: 2 additions & 2 deletions src/containers/List/ListCard/ListCard.module.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.Card {
width: 310px;
width: 31%;
position: relative !important;
margin-right: 24px;
margin-bottom: 24px;
Expand Down Expand Up @@ -32,7 +32,7 @@

.CardActions {
position: absolute !important;
width: inherit;
width: 100%;
bottom: 0px !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}

.Actions {
width: 130px;
width: 150px;
justify-content: flex-end;
margin-left: auto;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { List } from '../../List/List';
export interface StaffManagementProps {}

export const StaffManagementList: React.SFC<StaffManagementProps> = () => {
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 = <StaffIcon className={styles.StaffIcon} />;

Expand Down
6 changes: 3 additions & 3 deletions src/containers/Template/List/Template.module.css
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down

0 comments on commit 581772c

Please sign in to comment.