Skip to content

Commit 5b8ced3

Browse files
committed
organization page responsive
1 parent f98e2ee commit 5b8ced3

File tree

8 files changed

+298
-162
lines changed

8 files changed

+298
-162
lines changed

src/user/dashboard/dashboard.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ class Dashboard extends Component {
6363

6464
<div className="dashboard">
6565
<Navigation dashboard={this.state.dashboard} />
66-
<div className="content-container">
67-
<div className="news">
66+
<div className="dashboard__container">
67+
<div className="dashboard__container__news">
6868
{this.state.isLoading ? (
6969
notifyUsersLoading()
7070
) : (
@@ -77,7 +77,7 @@ class Dashboard extends Component {
7777
)}
7878
{this.state.isLoading ? newsFeedLoading() : <NewsFeed allMix={allMix} allProjects={allProjects} allPosts={allPosts} allEvents={allEvents}/>}
7979
</div>
80-
<div className="promotions">
80+
<div className="dashboard__promotions">
8181
{this.state.isLoading ? portfolioLoading() : <Portfolio />}
8282
</div>
8383
</div>

src/user/dashboard/dashboard.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
.content-container {
1+
.dashboard__container {
22
display: flex;
33
min-height: 100vh;
44
height: auto;
55
font-family: Muli, sans-serif;
6-
.news {
6+
.dashboard__container__news {
77
margin-left: 13vw;
88
flex-grow: 4;
99
.notify-user {
1010
display: flex;
1111
padding: 20px 0px 20px 30px;
1212
}
1313
}
14-
.promotions {
14+
.dashboard__promotions {
1515
height: 256px;
1616
flex-direction: row;
1717
flex-grow: 2;
1818
padding: 20px 12px 20px 0px;
1919
}
2020
@media (min-width: 320px) and (max-width: 1024px){
21-
.promotions {
21+
.dashboard__promotions {
2222
display: none;
2323
}
24-
.news {
24+
.dashboard__container__news {
2525
margin-left: 0;
2626
}
2727
}

src/user/organization/org-contact/OrgContact.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import React, { Component } from "react";
22
import "./org-contact.scss";
3-
import { Card, Avatar, CardContent } from '@material-ui/core';
3+
import { Avatar, CardContent } from '@material-ui/core';
44
import { connect } from 'react-redux'
55
import { getOrgProfile } from '../../../actions/orgAction'
6+
import { Card, ListGroup } from 'react-bootstrap';
67

78
class OrgContact extends Component {
89
constructor(props) {
@@ -24,27 +25,28 @@ class OrgContact extends Component {
2425
<div className="contact">
2526
<h2>Contact</h2>
2627
<Card className="contact-us">
27-
<CardContent>
28-
<div className="email-content">
28+
<Card.Body>
29+
<div className="contact__content">
2930
<p className="initial">Email</p><br/>
30-
<div className="email-info">
31-
{this.props.admins.map(i => { return <div className='info'> <Avatar className="avatar" alt='Random'>R</Avatar> <p>{i.email}</p> </div> })}
32-
</div>
33-
<div className='designation'>
34-
{this.props.admins.map(i => { return <p>{i.designation}</p> })}
35-
</div>
31+
<ListGroup className="contact__content__collection">
32+
{this.props.admins.map(i => { return <ListGroup.Item className="contact_item"> <Avatar className="avatar" alt='Random'>R</Avatar> <div className="data_container"><span className="data">{i.email}</span> <span className="designation">{i.designation}</span></div> </ListGroup.Item>})}
33+
</ListGroup>
3634
</div>
37-
<div className="email-content">
35+
<div className="contact__content">
3836
<p className='initial'>Website</p>
39-
<p className='info'>{this.state.website}</p>
40-
<p className='hidden'>Community</p>
37+
<ListGroup className="contact__content__collection">
38+
<ListGroup.Item className="contact_item"> {this.state.website}</ListGroup.Item>
39+
</ListGroup>
4140
</div>
42-
<div className='email-content'>
41+
<div className='contact__content'>
4342
<p className="initial">Community email</p>
44-
<p className='info'>{this.state.email}</p>
43+
<ListGroup className="contact__content__collection">
44+
<ListGroup.Item className="contact_item"> {this.state.email}</ListGroup.Item>
45+
</ListGroup>
4546
<p></p>
4647
</div>
47-
</CardContent>
48+
49+
</Card.Body>
4850
</Card>
4951
</div>
5052
)

src/user/organization/org-contact/org-contact.scss

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,38 @@
66
border: solid 1px #dfe9f1;
77
overflow: auto;
88
margin-bottom: 5px;
9-
.email-content {
9+
.contact__content {
1010
display: flex;
1111
flex-direction: row;
12-
justify-content: space-between;
12+
margin-bottom: 1vh;
1313
.designation {
14-
text-align: right;
1514
color: rgba(0, 0, 0, 0.5);
16-
font-weight: 650;
15+
font-weight: bold;
1716
}
1817
.initial {
1918
color: rgba(0, 0, 0, 0.5);
2019
font-weight: 550;
20+
flex: 1;
21+
}
22+
.data_container {
23+
flex: 2;
24+
}
25+
.data {
26+
display: block;
2127
}
2228
.hidden {
2329
visibility: hidden;
2430
}
25-
.email-info {
31+
.contact__content__collection {
32+
flex: 3;
33+
}
34+
.contact_item {
2635
display: flex;
27-
flex-direction: column;
28-
.info {
29-
display: flex;
30-
flex-direction: row;
31-
.avatar {
32-
width: 25px;
33-
height: 25px;
34-
margin-right: 5px;
35-
}
36+
padding: 0;
37+
border: 0;
38+
margin-bottom: 1rem;
39+
div {
40+
margin-right: 10px;
3641
}
3742
}
3843
}

src/user/organization/org-info/org-info.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,20 @@
120120
.org-followbtn {
121121
margin: 10px;
122122
}
123+
124+
@media (min-width: 320px) and (max-width: 1024px){
125+
126+
.org-details {
127+
width: 100%;
128+
margin: auto 2vw;
129+
.org-image {
130+
.org-pic {
131+
.orgpic {
132+
width: 120px;
133+
height: 120px;
134+
}
135+
}
136+
}
137+
}
138+
139+
}

0 commit comments

Comments
 (0)