Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix]: Adding Responsiveness to the organisation page. #1172 #1173

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −15
Open

[Fix]: Adding Responsiveness to the organisation page. #1172 #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/Organization/OrgUsers/OrgDelete.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import { makeStyles } from "@mui/styles";
const useStyles = makeStyles(theme => ({
root: {
border: `1px solid ${theme.palette.divider}`,
borderRadius: "10px"
borderRadius: "10px",
[theme.breakpoints.down("md")]: {
marginRight: 20,
},
},
gridPadding: {
padding: theme.spacing(2)
Expand Down
6 changes: 4 additions & 2 deletions src/components/Organization/pages/General.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ const useStyles = makeStyles(theme => ({
flexDirection: "column",
gap: 10,
[theme.breakpoints.down("md")]: {
width: "99%"
width: "99%",
paddingRight: 0
},
[theme.breakpoints.down("xs")]: {
width: "99%"
width: "99%",
paddingRight: 0
},
marginTop: "20px"
},
Expand Down
6 changes: 4 additions & 2 deletions src/components/Organization/pages/Passwords.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ const useStyles = makeStyles(theme => ({
justifyContent: "space-evenly",
width: "98%",
marginBottom: "20px",
paddingBottom: "20px",
[theme.breakpoints.between("xs", "sm")]: {
marginLeft: "10px"
marginLeft: "10px",
paddingRight: "25px",
}
},
input: {
Expand Down Expand Up @@ -73,7 +75,7 @@ function Passwords() {
</Grid>
<Grid className={classes.inputContainer} item xs={12}>
<Typography>New Password</Typography>
<InputBase className={classes.input} placeholder="New Password" />
<InputBase className={classes.input} placeholder="New Password" />
</Grid>
<Grid className={classes.inputContainer} item xs={12}>
<Typography>Confirm new password</Typography>
Expand Down
29 changes: 19 additions & 10 deletions src/components/Profile/SwitchAccount/SwitchAccount.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ const useStyles = makeStyles(theme => ({
justifyContent: "space-between",
alignItems: "center",
[theme.breakpoints.down("md")]: {
width: "95%"
width: "95%",
flexDirection: "column"
},
[theme.breakpoints.down("xs")]: {
width: "95%",
width: "80%",
flexDirection: "column"
}
},
Expand All @@ -35,7 +36,10 @@ const useStyles = makeStyles(theme => ({
},
large: {
width: theme.spacing(7),
height: theme.spacing(7)
height: theme.spacing(7),
[theme.breakpoints.down("md")]: {
marginLeft: "20px"
}
},
details: {
display: "flex",
Expand All @@ -49,8 +53,8 @@ const useStyles = makeStyles(theme => ({
display: "flex",
flexDirection: "row",
alignItems: "center",
[theme.breakpoints.down("xs")]: {
flexDirection: "column"
[theme.breakpoints.down("md")]: {
marginLeft: "0px"
}
},
name: {
Expand All @@ -59,15 +63,20 @@ const useStyles = makeStyles(theme => ({
}
},
margin: {
marginLeft: "15px",
marginLeft: "40px",
[theme.breakpoints.down("xs")]: {
marginLeft: "0px"
}
},
marginR: {
marginRight: "20px",
[theme.breakpoints.down("xs")]: {
marginRight: "0px"
[theme.breakpoints.down("md")]: {
marginLeft: "200px"
}
},
iconStyle: {
[theme.breakpoints.down("md")]: {
marginLeft: "-40px"
}
}
}));
Expand Down Expand Up @@ -122,9 +131,9 @@ export default function SwitchAccount({
{name}
</Typography>
<div className={classes.divDetails}>
<Typography variant="subtitle2">Personal account</Typography>
<Typography variant="subtitle2" >Personal account</Typography>
<IconButton aria-label="share">
<SwapHorizIcon />
<SwapHorizIcon className={classes.iconStyle}/>
</IconButton>

<div>
Expand Down