Skip to content

Commit 3f04578

Browse files
author
Jin Ying
committed
AboutComponent: Update design
1 parent 67ab561 commit 3f04578

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

src/components/about/TeamComponent.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ class TeamComponent extends Component {
5050
<TeamVerticalCardComponent
5151
name={partner.node.frontmatter.name}
5252
profilePicture={partner.node.frontmatter.profilePicture.relativePath}
53-
club={partner.node.frontmatter.club}
54-
role={partner.node.frontmatter.role}
5553
/>
5654
))
5755
)

src/components/about/TeamHorizontalCardComponent.js

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,28 @@ import Image from '../commons/Image'
1010
const styles = theme => ({
1111
profileImage: {
1212
borderRadius: '50%',
13-
width: '4.5rem',
14-
height: '4.5rem',
13+
width: '6rem',
14+
height: '6rem',
1515
[theme.breakpoints.up('md')]: {
16-
width: '5.5rem',
17-
height: '5.5rem'
16+
width: '6.75rem',
17+
height: '6.75rem'
1818
},
1919
},
2020
name: {
2121
fontWeight: 700,
22-
marginBottom: '0.75em',
2322
marginTop: '1.5em',
2423
[theme.breakpoints.up('sm')]: {
25-
marginBottom: '1.25em',
2624
marginTop: 0
2725
}
2826
},
27+
role: {
28+
marginBottom: '0.75em',
29+
color: '#9e9e9e',
30+
fontStyle: 'italic',
31+
[theme.breakpoints.up('sm')]: {
32+
marginBottom: '1.25em',
33+
}
34+
}
2935
})
3036

3137
class TeamHorizontalCardComponent extends Component {
@@ -34,15 +40,16 @@ class TeamHorizontalCardComponent extends Component {
3440

3541
return (
3642
info.map((i, index) => (
37-
<Grid item xs={12} sm={6}>
43+
<Grid item xs={12} sm={9}>
3844
<div className={classes.root}>
3945
<Grid container>
4046
<Grid item sm={4} lg={3}>
4147
<Image filename={i.node.frontmatter.profilePicture.relativePath} classProps={classes.profileImage} />
4248
</Grid>
4349

44-
<Grid item sm={8} lg={9} className={classes.info}>
50+
<Grid item sm={8} lg={9}>
4551
<Typography variant="body1" className={classes.name}>{i.node.frontmatter.name}</Typography>
52+
<Typography variant="subtitle2" className={classes.role}>{i.node.frontmatter.role}</Typography>
4653
<Typography variant="body2" className={classes.title}>{i.node.frontmatter.description}</Typography>
4754
</Grid>
4855
</Grid>

src/components/about/TeamVerticalCardComponent.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const styles = theme => ({
3636
height: '5.5rem'
3737
},
3838
},
39-
4039
})
4140

4241
class TeamVerticalCardComponent extends Component {
@@ -47,13 +46,11 @@ class TeamVerticalCardComponent extends Component {
4746
return (
4847
<Grid item xs={6} sm={3} className={classes.root}>
4948
<div className={classes.profilePictureContainer}>
50-
<Image filename={profilePicture} classProps={classes.profilePicture} />
49+
<Image filename={profilePicture} classProps={classes.profilePicture} classImageStyle={{ objectFit: 'contain' }} />
5150
</div>
5251

5352
<div className={classes.description}>
5453
<Typography variant="body1" className={classes.name} gutterBottom>{name}</Typography>
55-
<Typography variant="caption" className={classes.club} gutterBottom>{club}</Typography>
56-
<Typography variant="caption" className={classes.role} gutterBottom>{role}</Typography>
5754
</div>
5855
</Grid>
5956
);
@@ -63,8 +60,6 @@ class TeamVerticalCardComponent extends Component {
6360
TeamVerticalCardComponent.propTypes = {
6461
profilePicture: PropTypes.string.isRequired,
6562
name: PropTypes.string.isRequired,
66-
role: PropTypes.string.isRequired,
67-
club: PropTypes.string.isRequired
6863
};
6964

7065
export default withStyles(styles)(TeamVerticalCardComponent);

src/images/about_cover.jpg

1.87 MB
Loading

src/pages/about.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export const pageQuery = graphql`
4242
node {
4343
frontmatter {
4444
name
45+
role
4546
description
4647
profilePicture {
4748
relativePath
@@ -60,6 +61,7 @@ export const pageQuery = graphql`
6061
node {
6162
frontmatter {
6263
name
64+
role
6365
description
6466
profilePicture {
6567
relativePath
@@ -82,8 +84,6 @@ export const pageQuery = graphql`
8284
node {
8385
frontmatter {
8486
name
85-
club
86-
role
8787
profilePicture {
8888
relativePath
8989
}

0 commit comments

Comments
 (0)