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

styling fix #615

Closed
wants to merge 2 commits into from
Closed

styling fix #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5acd4a
styling fix
vinayaksh42 Sep 7, 2020
bfd2d94
pagination
vinayaksh42 Sep 7, 2020
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
6 changes: 3 additions & 3 deletions src/user/events/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
28 changes: 23 additions & 5 deletions src/user/events/events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.organization {
display: flex;
min-height: 100vh;
height: auto;
font-family: Muli, sans-serif;
min-height: 100vh;
font-family: Muli, sans-serif;
.navigation {
background: #f5f5f5;
flex-grow: 1;
Expand Down Expand Up @@ -34,12 +33,12 @@
height: 42vh;
}

.event__pagination__container {
.project__pagination__container {
display: flex;
padding-top: 20px;
flex-direction: row;
justify-content: center;
align-items: center;
padding-top: 29px;
}
}
}
Expand Down Expand Up @@ -163,3 +162,22 @@
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;
}
1 change: 1 addition & 0 deletions src/user/organization/organization.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
min-height: 100vh;
height: auto;
font-family: "Inter";
padding-left: 20px;
.navigation {
overflow-y: scroll;
background: #f5f5f5;
Expand Down
2 changes: 1 addition & 1 deletion src/user/projects/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions src/user/projects/projects.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,7 +23,7 @@
line-height: 1.3em;
color: #2D2D2D;
}
#project_header {
.project__header {
font-family: Inter;
font-style: normal;
font-weight: normal;
Expand Down