Skip to content

Commit 79bd26d

Browse files
lazycipherlazycipher
committed
changed circular buttons to rect ones
1 parent d363e93 commit 79bd26d

File tree

6 files changed

+76
-100
lines changed

6 files changed

+76
-100
lines changed

‎src/user/auth/login-form/login-form.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
button {
1515
width: 104px;
1616
background-color: #1a73e8;
17-
border-radius: 100px;
1817
}
1918
}
2019
}

‎src/user/auth/login/login.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ body {
119119
text-decoration:none;
120120
padding:0.5rem 3rem;
121121
background: #1A73E8;
122-
border-radius: 100px;
122+
border-radius: 0.25rem;
123123
display:inline-block;
124124
&:hover {
125125
background-color: #1864c9;

‎src/user/dashboard/Community/CommunitySetting.js‎

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -51,47 +51,43 @@ class CommunitySetting extends Component {
5151
return (
5252
<>
5353
<Navigation orgSettings={this.state.org} user={this.props.user} />
54-
<div className="overall_container">
55-
<div className="org_settings_view">
56-
<div className="main_section">
57-
<div className="left_nav">
58-
<p className="header_text">Community Settings</p>
59-
<Desktop>
60-
<LeftNav
61-
data={{
62-
option: this.state.option,
63-
changeOption: this.changeOption.bind(this),
64-
}}
65-
/>
66-
</Desktop>
67-
<Mobile>
68-
<Accordion>
69-
<Accordion.Toggle onClick={() => toggleSidebar()} variant="outline-secondary" size="sm" as={Button} eventKey="0">
70-
{this.state.sidebarOpen?"Close Menu":"Setting Menu"}
71-
</Accordion.Toggle>
72-
<Accordion.Collapse eventKey="0">
73-
<LeftNav
74-
data={{
75-
option: this.state.option,
76-
changeOption: this.changeOption.bind(this),
77-
}}
78-
/>
79-
</Accordion.Collapse>
80-
</Accordion>
81-
</Mobile>
82-
</div>
83-
<div className="right_section">
84-
{view === "profile" ? <OrgProfile /> : null}
85-
{view === "permission" ? <OrgPermission /> : null}
86-
{view === "settings" ? <OrgSetting /> : null}
87-
{view === "authentication" ? <OrgAuth /> : null}
88-
{view === "maintenance" ? <OrgMaintenance /> : null}
89-
{view === "activity" ? (
90-
<Users
91-
handleOption={{ changeOption: this.changeOption.bind(this) }}
92-
/>) : null }
93-
</div>
94-
</div>
54+
<div className="main_section">
55+
<div className="left_nav">
56+
<p className="header_text">Community Settings</p>
57+
<Desktop>
58+
<LeftNav
59+
data={{
60+
option: this.state.option,
61+
changeOption: this.changeOption.bind(this),
62+
}}
63+
/>
64+
</Desktop>
65+
<Mobile>
66+
<Accordion>
67+
<Accordion.Toggle onClick={() => toggleSidebar()} variant="outline-secondary" size="sm" as={Button} eventKey="0">
68+
{this.state.sidebarOpen?"Close Menu":"Setting Menu"}
69+
</Accordion.Toggle>
70+
<Accordion.Collapse eventKey="0">
71+
<LeftNav
72+
data={{
73+
option: this.state.option,
74+
changeOption: this.changeOption.bind(this),
75+
}}
76+
/>
77+
</Accordion.Collapse>
78+
</Accordion>
79+
</Mobile>
80+
</div>
81+
<div className="right_section_content">
82+
{view === "profile" ? <OrgProfile /> : null}
83+
{view === "permission" ? <OrgPermission /> : null}
84+
{view === "settings" ? <OrgSetting /> : null}
85+
{view === "authentication" ? <OrgAuth /> : null}
86+
{view === "maintenance" ? <OrgMaintenance /> : null}
87+
{view === "activity" ? (
88+
<Users
89+
handleOption={{ changeOption: this.changeOption.bind(this) }}
90+
/>) : null }
9591
</div>
9692
</div>
9793
</>

‎src/user/dashboard/Community/community.scss‎

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,55 @@
1-
.overall_container {
1+
.main_section {
22
display: flex;
3-
.org_settings_view {
4-
margin-left: 13vw;
5-
margin-top: 35px;
6-
.main_section {
7-
display: flex;
8-
flex-direction: row;
9-
justify-items: center;
10-
flex-wrap: wrap;
11-
margin-top: -1.3em;
12-
.left_nav {
13-
max-width: 20%;
14-
height: 50%;
15-
margin-top: 16px;
16-
margin-left: 10px;
17-
.header_text {
18-
font-family: Inter;
19-
font-style: normal;
20-
font-weight: 500;
21-
font-size: 18px;
22-
line-height: 21px;
23-
letter-spacing: 0.25px;
24-
color: #9e9e9e;
25-
}
26-
}
27-
28-
.right_section {
29-
width: 80vw;
30-
max-width: 75%;
31-
// overflow-y: auto;
32-
margin-top: -0.7em;
33-
}
3+
flex-direction: row;
4+
justify-items: center;
5+
flex-wrap: wrap;
6+
margin: 35px auto auto 15vw;
7+
.left_nav {
8+
max-width: 20%;
9+
height: 50%;
10+
margin-top: 16px;
11+
margin-left: 10px;
12+
.header_text {
13+
font-family: Inter;
14+
font-style: normal;
15+
font-weight: 500;
16+
font-size: 18px;
17+
line-height: 21px;
18+
letter-spacing: 0.25px;
19+
color: #9e9e9e;
3420
}
3521
}
22+
23+
.right_section_content {
24+
width: 80vw;
25+
max-width: 75%;
26+
// overflow-y: auto;
27+
margin-top: -0.7em;
28+
}
3629
}
3730

3831

3932

33+
4034
.main_navigation::-webkit-scrollbar {
4135
display: none;
4236
}
4337

4438
@media (min-width: 320px) and (max-width: 1024px){
45-
.overall_container {
46-
display: flex;
39+
.main_section {
40+
width: 100%;
41+
margin: 0;
4742
padding: 2.5vh 2.5vw;
48-
.org_settings_view {
49-
margin: 0;
43+
flex-direction: column;
44+
.left_nav {
45+
width: 100%;
46+
max-width: 100%;
47+
margin: 10px auto;
48+
}
49+
.right_section_content {
5050
width: 100%;
51-
.main_section {
52-
flex-direction: column;
53-
margin-top: 0;
54-
.left_nav {
55-
max-width: 100%;
56-
height: auto;
57-
margin: 0;
58-
}
59-
.right_section {
60-
width: 100%;
61-
max-width: 100%;
62-
margin-top: 0;
63-
}
64-
}
51+
max-width: 100%;
52+
margin-top: 0;
6553
}
6654
}
6755
}

‎src/user/dashboard/settings/styles/SettingSidebar.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
.right__setting__option__content {
2525
width: 56vw;
2626
.deactivate___settings__btn {
27-
border-radius: 100px;
2827
&:hover {
2928
background-color: #ffffff;
3029
}

‎src/user/organization/organization.scss‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
font-weight: 600;
136136
font-size: 16px;
137137
line-height: 27px;
138-
border-radius: 100px;
139138
color: #ffffff;
140139
}
141140
}
@@ -201,12 +200,7 @@
201200
display: flex;
202201
.details__proposal_btn {
203202
margin: 0 auto;
204-
.proposal-btn {
205-
border-radius: 100px;
206-
}
207203
}
208204
}
209205
}
210-
211-
212206
}

0 commit comments

Comments
 (0)