diff --git a/src/user/events/events.js b/src/user/events/events.js index 0689a436..a9e9c0f3 100644 --- a/src/user/events/events.js +++ b/src/user/events/events.js @@ -276,13 +276,13 @@ class Events extends Component { <div className="navigation"> <Navigation event={this.state.event}></Navigation> </div> - <div className="events"> - <h1 className="event_header">All Events</h1> + <div className="news projects"> + <p className="event_header">All Events</p> <Grid container spacing={3}> {Events} </Grid> - <div className="event__pagination__container"> + <div className="project__pagination__container"> <Pagination showSizeChanger onShowSizeChange={this.onShowSizeChange} diff --git a/src/user/events/events.scss b/src/user/events/events.scss index 4f8c4ea8..0689c179 100644 --- a/src/user/events/events.scss +++ b/src/user/events/events.scss @@ -1,7 +1,6 @@ .organization { display: flex; min-height: 100vh; - height: auto; font-family: Muli, sans-serif; .navigation { background: #f5f5f5; @@ -163,3 +162,21 @@ color: #1a73ed; } } +.event__header { + font-family: Inter; + font-style: normal; + font-weight: normal; + font-size: 1.5em; + line-height: 1.3em; + color: #2D2D2D; +} + + + +.event__pagination__container { +display: flex; +padding-top: 20px; +flex-direction: row; +justify-content: center; +align-items: center; +} \ No newline at end of file diff --git a/src/user/projects/projects.js b/src/user/projects/projects.js index ce995d1b..06a41522 100644 --- a/src/user/projects/projects.js +++ b/src/user/projects/projects.js @@ -99,7 +99,7 @@ class Projects extends Component { <Navigation proj={this.state.proj}></Navigation> </div> <div className="news projects"> - <p id="project__header">All Projects</p> + <p className="project__header">All Projects</p> <div className={useStyles.root}> <Grid container spacing={3}> {Projects} diff --git a/src/user/projects/projects.scss b/src/user/projects/projects.scss index 36d82dae..51145cd7 100644 --- a/src/user/projects/projects.scss +++ b/src/user/projects/projects.scss @@ -12,9 +12,9 @@ } .projects { - margin-top: 1vh; - margin-left: 4vw; - margin-right: 6vw; + padding: 20px; + margin-top: 2vh; + margin-left: 4vw; p { font-family: Inter; font-style: normal; @@ -23,7 +23,7 @@ line-height: 1.3em; color: #2D2D2D; } - #project_header { + .project__header { font-family: Inter; font-style: normal; font-weight: normal;