Skip to content

Commit

Permalink
update formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Megha-Pathak committed Jul 23, 2020
1 parent f1e4575 commit 4bcd940
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 93 deletions.
20 changes: 5 additions & 15 deletions client/src/Components/Layout/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,21 @@ import { makeStyles } from "@material-ui/core/styles";
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import Box from '@material-ui/core/Box';
import { Link } from '@material-ui/core';


const useStyles = makeStyles({
root: {
minWidth: 275,
height: 150
height: 150,
},
title: {
fontSize: 40,
marginLeft: 60,
marginTop: 30
marginTop: 30,
},


pos: {
marginBottom: 12,
marginLeft: 60
}
marginLeft: 60,
},
});

export default function OutlinedCard(props) {
Expand All @@ -35,12 +30,7 @@ export default function OutlinedCard(props) {
<Typography className={classes.title} component="h2">
{props.name}
</Typography>



<Typography className={classes.pos}>
{props.desc}
</Typography>
<Typography className={classes.pos}>{props.desc}</Typography>
</CardContent>
</Card>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Typography from "@material-ui/core/Typography";
import Box from "@material-ui/core/Box";
import { Link } from "@material-ui/core";
import Button from "@material-ui/core/Button";
import useStyles from "./ProjectDescStyling";
import useStyles from "./ProjectHeaderStyling";

const LeftPane = () => {
const classes = useStyles();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,51 +1,38 @@
import { makeStyles } from "@material-ui/core/styles";

const useStyles = makeStyles((theme) => ({
const useStyles = makeStyles({
root: {
flexGrow: 1,
marginTop: 50,
marginLeft: 50,
marginRight: 50,
},
LeftCardContent: {
textAlign: "left",
marginLeft: 70,
pos1: {
marginTop: 140,
},
RightCardContent: {
marginRight: 70,
textAlign: "Right",
buttonspacing: {
marginLeft: 195,
},
projectname: {
marginTop: 30,
fontSize: 48,
},
submit: {
marginTop: 30,
head: {
fontSize: 18,
marginTop: 40,
},
orgname: {
fontSize: 20,
marginLeft: -7,
marginTop: -35,
},
orglink: {
fontSize: 15,
marginTop: -30,
},
cap: {
borderRadius: "30px",
text: {
marginLeft: 10,
fontSize: 13,
textTransform: "none",
fontSize: 17,
},
tt: {
fontSize: 18,
marginTop: 15,
listSection: {
backgroundColor: "inherit",
},
mentors: {
fontSize: 18,
ul: {
backgroundColor: "inherit",
padding: 0,
},
contact: {
fontSize: 13,
marginLeft: 10,
tasks: {
marginLeft: -10,
},
github: {
fontSize: 15,
},
}));
});

export default useStyles;
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,7 @@ import Typography from "@material-ui/core/Typography";
import Box from "@material-ui/core/Box";
import List from "@material-ui/core/List";
import { Link } from "@material-ui/core";

const useStyles = makeStyles({
root: {
marginTop: 50,
marginLeft: 50,
marginRight: 50,
},
pos1: {
marginTop: 140,
},
buttonspacing: {
marginLeft: 195,
},
head: {
fontSize: 18,
marginTop: 40,
},
text: {
marginLeft: 10,
fontSize: 17,
},
listSection: {
backgroundColor: "inherit",
},
ul: {
backgroundColor: "inherit",
padding: 0,
},
tasks: {
marginLeft: -10,
},
github: {
fontSize: 15,
},
});
import useStyles from "./ProjectDescStyling";

function ProjectDescription() {
const classes = useStyles();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ const ProjectDetailsContainer = () => {
</div>
</div>
);
}
};
export default ProjectDetailsContainer;
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Card from "@material-ui/core/Card";
import Grid from "@material-ui/core/Grid";
import LeftPane from "./LeftPane";
import RightPane from "./RightPane";
import useStyles from "./ProjectDescStyling";
import useStyles from "./ProjectHeaderStyling";

const FormRow = () => {
return (
Expand All @@ -18,7 +18,7 @@ const FormRow = () => {
);
};

const ProjectDetailsHeader =() => {
const ProjectDetailsHeader = () => {
const classes = useStyles();
return (
<div className={classes.root}>
Expand All @@ -31,6 +31,6 @@ const ProjectDetailsHeader =() => {
</Card>
</div>
);
}
};

export default ProjectDetailsHeader
export default ProjectDetailsHeader;
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { makeStyles } from "@material-ui/core/styles";

const useStyles = makeStyles((theme) => ({
root: {
flexGrow: 1,
},
LeftCardContent: {
textAlign: "left",
marginLeft: 70,
},
RightCardContent: {
marginRight: 70,
textAlign: "Right",
},
projectname: {
marginTop: 30,
fontSize: 48,
},
submit: {
marginTop: 30,
fontSize: 18,
},
orgname: {
fontSize: 20,
marginLeft: -7,
marginTop: -35,
},
orglink: {
fontSize: 15,
marginTop: -30,
},
cap: {
borderRadius: "30px",

marginLeft: 10,
fontSize: 13,
textTransform: "none",
},
tt: {
fontSize: 18,
marginTop: 15,
},
mentors: {
fontSize: 18,
},
contact: {
fontSize: 13,
marginLeft: 10,
},
}));

export default useStyles;
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import { Link } from "@material-ui/core";
import Button from "@material-ui/core/Button";
import useStyles from "./ProjectDescStyling";
import useStyles from "./ProjectHeaderStyling";

const RightPane = () => {
const classes = useStyles();
Expand Down

0 comments on commit 4bcd940

Please sign in to comment.