Merge pull request #56 from CPSC319-Winter-term-2/mbalsdon-contacts-touchups
change contactspage styling also fixes some minor spacing issues
This commit is contained in:
commit
981480d30d
@ -16,7 +16,7 @@ const Body: React.FC<Props> = (props) => {
|
|||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
width: "100%",
|
width: "100%",
|
||||||
height: "100%",
|
height: "100%",
|
||||||
mt: 2,
|
mt: 5,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Toolbar />
|
<Toolbar />
|
||||||
|
|||||||
@ -24,14 +24,17 @@ const LowerBody: React.FC<Props> = (props) => {
|
|||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
border: 1,
|
border: 1,
|
||||||
borderRadius: 2,
|
borderRadius: 2,
|
||||||
|
borderColor: "#af000d",
|
||||||
|
backgroundColor: "#af000d",
|
||||||
width: "70%",
|
width: "70%",
|
||||||
height: "60%",
|
height: "60%",
|
||||||
alignSelf: "center",
|
alignSelf: "center",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Typography variant="h4" textAlign="center">
|
<Typography sx={{ color: "white", my: 1 }} variant="h4" textAlign="center">
|
||||||
Upcoming meetings
|
Upcoming meetings
|
||||||
</Typography>
|
</Typography>
|
||||||
|
{/* <Divider color="indianred" /> */}
|
||||||
<List sx={{ maxHeight: "100%", overflow: "auto" }}>
|
<List sx={{ maxHeight: "100%", overflow: "auto" }}>
|
||||||
{meetings.map((meeting, i) => (
|
{meetings.map((meeting, i) => (
|
||||||
<Box
|
<Box
|
||||||
@ -40,8 +43,7 @@ const LowerBody: React.FC<Props> = (props) => {
|
|||||||
justifyContent: "space-between",
|
justifyContent: "space-between",
|
||||||
height: "50px",
|
height: "50px",
|
||||||
px: "10px",
|
px: "10px",
|
||||||
borderTop: 1,
|
backgroundColor: i % 2 ? "mistyrose" : "white",
|
||||||
borderBottom: i === meetings.length - 1 ? 1 : 0,
|
|
||||||
}}
|
}}
|
||||||
key={i}
|
key={i}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -45,6 +45,7 @@ const UpperBody: React.FC<Props> = (props) => {
|
|||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
border: 1,
|
border: 1,
|
||||||
borderRadius: 2,
|
borderRadius: 2,
|
||||||
|
borderColor: "#af000d",
|
||||||
width: "70%",
|
width: "70%",
|
||||||
alignSelf: "center",
|
alignSelf: "center",
|
||||||
mb: 2,
|
mb: 2,
|
||||||
@ -59,7 +60,7 @@ const UpperBody: React.FC<Props> = (props) => {
|
|||||||
mx: 4,
|
mx: 4,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Typography variant="h3">{props.contactInfo.name}</Typography>
|
<Typography sx={{ pt: 2 }} variant="h3">{props.contactInfo.name}</Typography>
|
||||||
{!favoritesUuids.includes(props.contactInfo.uuid) ? (
|
{!favoritesUuids.includes(props.contactInfo.uuid) ? (
|
||||||
<Button
|
<Button
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
@ -75,7 +76,7 @@ const UpperBody: React.FC<Props> = (props) => {
|
|||||||
</Button>
|
</Button>
|
||||||
) : (
|
) : (
|
||||||
<Button
|
<Button
|
||||||
variant="outlined"
|
variant="contained"
|
||||||
color="secondary"
|
color="secondary"
|
||||||
startIcon={<RemoveIcon />}
|
startIcon={<RemoveIcon />}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
@ -103,23 +104,23 @@ const UpperBody: React.FC<Props> = (props) => {
|
|||||||
>
|
>
|
||||||
<Box>
|
<Box>
|
||||||
<IconButton
|
<IconButton
|
||||||
sx={{ border: 1, mr: 1, backgroundColor: "secondary" }}
|
sx={{ border: 1, backgroundColor: "white", mr: 1 }}
|
||||||
size="large"
|
size="large"
|
||||||
color="secondary"
|
color="secondary"
|
||||||
>
|
>
|
||||||
<PhoneIcon fontSize="large" />
|
<PhoneIcon fontSize="large" />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
<IconButton sx={{ border: 1, mr: 1 }} size="large" color="secondary">
|
<IconButton sx={{ border: 1, backgroundColor: "white", mr: 1 }} size="large" color="secondary">
|
||||||
<VideocamIcon fontSize="large" />
|
<VideocamIcon fontSize="large" />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
<IconButton sx={{ border: 1, mr: 1 }} size="large" color="secondary">
|
<IconButton sx={{ border: 1, backgroundColor: "white", mr: 1 }} size="large" color="secondary">
|
||||||
<GroupsIcon fontSize="large" />
|
<GroupsIcon fontSize="large" />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
<Box sx={{ display: "flex", flexDirection: "column" }}>
|
<Box sx={{ display: "flex", flexDirection: "column" }}>
|
||||||
<Typography sx={{ textAlign: "right" }}>{meetingStatus}</Typography>
|
<Typography variant="button" sx={{ textAlign: "right" }}>{meetingStatus}</Typography>
|
||||||
{detailedMeeting ? (
|
{detailedMeeting ? (
|
||||||
<Typography>{detailedMeeting.topic}</Typography>
|
<Typography variant="h6">{detailedMeeting.topic}</Typography>
|
||||||
) : null}
|
) : null}
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
Reference in New Issue
Block a user