Skip to content

Commit a117602

Browse files
lazycipherlazycipher
committed
Changes as peer per review
1 parent 385c5e9 commit a117602

File tree

7 files changed

+128
-143
lines changed

7 files changed

+128
-143
lines changed

‎src/user/Activity/Activity.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ class Activity extends Component {
6262
return (
6363
<>
6464
<Navigation orgSettings={this.state.org} user={this.props.user} />
65-
<div className="overall_container">
66-
<div className="org_settings_view">
6765
<div className="main_section">
6866
<div className="left_nav">
6967
<p className="header_text">Community Settings</p>
@@ -107,8 +105,6 @@ class Activity extends Component {
107105
) : null}
108106
</div>
109107
</div>
110-
</div>
111-
</div>
112108
</>
113109
);
114110
}

‎src/user/Activity/activity.scss‎

Lines changed: 38 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1-
.overall_container{
2-
display: flex;
3-
.main_navigation {
4-
left: -1px;
5-
top: -1px;
6-
height: 100vh;
7-
border: 1px solid #CCCCCC;
8-
box-sizing: border-box;
9-
}
10-
.user_activity_view {
11-
margin-top: 35px;
12-
margin-left: 15vw;
13-
margin-left: auto;
14-
margin-right: auto;
15-
.main_section {
1+
.main_section {
2+
margin: 35px auto auto 15vw;
163
display: flex;
174
flex-direction: row;
185
justify-items: center;
196
flex-wrap: wrap;
20-
margin-top: -1.3em;
21-
margin-left: -2vw;
227
.left_nav {
238
max-width: 20%;
249
height: 50%;
@@ -74,45 +59,51 @@
7459
}
7560
}
7661
}
77-
}
78-
}
7962
// mobile
8063
@media screen and (max-width: 768px) {
81-
.overall_container{
82-
.org_settings_view {
83-
.main_section {
84-
.left_nav {
85-
.navigation {
86-
.list-group {
87-
.link {
88-
display: none;
89-
}
90-
.header_text {
91-
font-size: 10px;
92-
}
93-
}
94-
}
95-
}
96-
}
64+
.main_section {
65+
width: 100%;
66+
margin: 0;
67+
padding: 2.5vh 2.5vw;
68+
flex-direction: column;
69+
.left_nav {
70+
width: 100%;
71+
max-width: 100%;
72+
margin: 10px auto;
73+
.navigation {
74+
.list-group {
75+
.link {
76+
display: none;
77+
}
78+
.header_text {
79+
font-size: 10px;
80+
}
81+
}
9782
}
9883
}
9984
}
85+
}
10086

10187
// tablet
102-
@media screen and (min-width: 768px) and (max-width: 1023px) {
103-
.overall_container {
104-
.org_settings_view {
105-
.main_section {
106-
.left_nav {
107-
.navigation {
108-
.list-group {
109-
.link {
110-
font-size: 5px;
111-
}
112-
}
88+
@media screen and (min-width: 768px) and (max-width: 1024px) {
89+
90+
.main_section {
91+
width: 100%;
92+
margin: 0;
93+
padding: 2.5vh 2.5vw;
94+
flex-direction: column;
95+
.left_nav {
96+
width: 100%;
97+
max-width: 100%;
98+
margin: 10px auto;
99+
.navigation {
100+
.list-group {
101+
.link {
102+
font-size: 5px;
113103
}
114104
}
115105
}
116106
}
117107
}
118-
}
108+
}
109+

‎src/user/dashboard/news-feed/news-feed.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ function NewsFeed(props) {
568568
<div className="news-feed">
569569
<div className="post-article">
570570
<div className="article">
571-
<Row>
571+
<Row className="content__row">
572572
<Col xs={12} lg={8}>
573573
<Paper
574574
component="form"
@@ -796,7 +796,7 @@ function NewsFeed(props) {
796796
</Mobile>
797797
</Col>
798798
<Col xs={12}>
799-
<Row>
799+
<Row className="content__row">
800800
{Boolean(type !== "All") ? (
801801
content
802802
) : (

‎src/user/dashboard/news-feed/news-feed.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
max-height: 55px;
1212
max-width: 1500px;
1313
}
14-
.row {
14+
.article__row, .content__row{
1515
width: 100%;
1616
}
1717
}
@@ -551,8 +551,8 @@
551551
width: 100vw;
552552
margin-bottom: 17px;
553553

554-
[class^=col-] {
555-
.row {
554+
[class^="col-"] {
555+
.content__row {
556556
width: 100vw;
557557
margin: 0 auto;
558558
}

‎src/user/organization/organization.js‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ class Organization extends Component {
124124
topBarLoading()
125125
) : (
126126
<div className="notify-user">
127-
<OrgInfo></OrgInfo>
127+
<OrgInfo />
128128
<Desktop>
129-
<Portfolio></Portfolio>
129+
<Portfolio />
130130
</Desktop>
131131
</div>
132132
)}
@@ -135,98 +135,98 @@ class Organization extends Component {
135135
cardLoading()
136136
) : (
137137
<>
138-
<Mobile>
139-
<div className="details">
140-
<div className="details__proposal">
138+
<Mobile>
139+
<div className="details">
140+
<div className="details__proposal">
141+
<Link
142+
to={{
143+
pathname: "/proposaleditor",
144+
state: {
145+
proposalId: "new",
146+
},
147+
}}
148+
className="details__proposal_btn"
149+
>
150+
<Button className="proposal-btn">Propose an Idea</Button>
151+
</Link>
152+
</div>
153+
<div className="tabs__container">
154+
<div className="nav__tab">
155+
<ul className="nav__list__container">
156+
<li
157+
className={
158+
type === "About"
159+
? "nav__single__tab selected"
160+
: "nav__single__tab"
161+
}
162+
onClick={() =>handleClick("About")}
163+
>
164+
About
165+
</li>
166+
<li
167+
className={
168+
type === "Updates"
169+
? "nav__single__tab selected"
170+
: "nav__single__tab"
171+
}
172+
onClick={() =>handleClick("Updates")}
173+
>
174+
Updates
175+
</li>
176+
<li
177+
className={
178+
type === "Contact"
179+
? "nav__single__tab selected"
180+
: "nav__single__tab"
181+
}
182+
onClick={() =>handleClick("Contact")}
183+
>
184+
Contact
185+
</li>
186+
</ul>
187+
</div>
188+
</div>
189+
<div className="details__content">
190+
{content}
191+
</div>
192+
</div>
193+
</Mobile>
194+
195+
<Desktop>
196+
<div className="details">
197+
<div className="tabs__container">
198+
<div className="nav__tab">
199+
<ul className="nav__list__container">
200+
<li
201+
className={
202+
type === "Overview"
203+
? "nav__single__tab selected"
204+
: "nav__single__tab"
205+
}
206+
onClick={() =>handleClick("Overview")}
207+
>
208+
Overview
209+
</li>
210+
</ul>
211+
</div>
212+
</div>
213+
{aboutContent}
214+
</div>
215+
<div className="sideinfo">
141216
<Link
142217
to={{
143218
pathname: "/proposaleditor",
144219
state: {
145220
proposalId: "new",
146221
},
147222
}}
148-
className="details__proposal_btn"
149223
>
150224
<Button className="proposal-btn">Propose an Idea</Button>
151225
</Link>
226+
{updatesContent}
227+
{contactContent}
152228
</div>
153-
<div className="tabs__container">
154-
<div className="nav__tab">
155-
<ul className="nav__list__container">
156-
<li
157-
className={
158-
type === "About"
159-
? "nav__single__tab selected"
160-
: "nav__single__tab"
161-
}
162-
onClick={() =>handleClick("About")}
163-
>
164-
About
165-
</li>
166-
<li
167-
className={
168-
type === "Updates"
169-
? "nav__single__tab selected"
170-
: "nav__single__tab"
171-
}
172-
onClick={() =>handleClick("Updates")}
173-
>
174-
Updates
175-
</li>
176-
<li
177-
className={
178-
type === "Contact"
179-
? "nav__single__tab selected"
180-
: "nav__single__tab"
181-
}
182-
onClick={() =>handleClick("Contact")}
183-
>
184-
Contact
185-
</li>
186-
</ul>
187-
</div>
188-
</div>
189-
<div className="details__content">
190-
{content}
191-
</div>
192-
</div>
193-
194-
</Mobile>
195-
<Desktop>
196-
<div className="details">
197-
<div className="tabs__container">
198-
<div className="nav__tab">
199-
<ul className="nav__list__container">
200-
<li
201-
className={
202-
type === "Overview"
203-
? "nav__single__tab selected"
204-
: "nav__single__tab"
205-
}
206-
onClick={() =>handleClick("Overview")}
207-
>
208-
Overview
209-
</li>
210-
</ul>
211-
</div>
212-
</div>
213-
{aboutContent}
214-
</div>
215-
<div className="sideinfo">
216-
<Link
217-
to={{
218-
pathname: "/proposaleditor",
219-
state: {
220-
proposalId: "new",
221-
},
222-
}}
223-
>
224-
<Button className="proposal-btn">Propose an Idea</Button>
225-
</Link>
226-
{updatesContent}
227-
{contactContent}
228-
</div>
229-
</Desktop>
229+
</Desktop>
230230
</>
231231
)}
232232

‎src/user/proposals/UserProposalDashboard/DashboardContent/DashboardContent.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
.searchbar-container {
88
flex-grow: 0.5;
9+
flex-direction: column;
910
.searchbar {
1011
border-radius: 25px;
1112
}

‎src/user/proposals/UserProposalDashboard/UserProposalDashboard.scss‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
padding: 2.5vh 2.5vw;
1818
margin-left: 0;
1919
flex-direction: column;
20-
.proposal_dashboard__content {
21-
flex: 1;
22-
}
23-
.proposal_dashboard__rightpanel {
20+
.proposal_dashboard__content, .proposal_dashboard__rightpanel {
2421
flex: 1;
2522
}
2623
}

0 commit comments

Comments
 (0)