Skip to content

Commit e2d470f

Browse files
authored
Merge pull request yowiputra#34 from yowiputra/popupcss
Added css for invite notification
2 parents eacec2f + 3b259a9 commit e2d470f

File tree

2 files changed

+46
-6
lines changed

2 files changed

+46
-6
lines changed

client/src/MainApp/MatchmakerPage.jsx

+15-4
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,23 @@ class MatchmakerPage extends Component {
3333
openPopupbox(senderData, receiverData) {
3434
const content = (
3535
<div>
36-
<div>
37-
{senderData.username + senderData.blurb + senderData.tagline}
36+
<div className="notif-avatar-div">
37+
<img className="notif-avatar" src={"https://api.adorable.io/avatars/285/" + senderData.username + "@adorable.io.png"} />
38+
</div>
39+
<div className="notif-username">
40+
{senderData.username}
3841
</div>
42+
<div className="notif-tagline">
43+
{senderData.tagline}
44+
</div>
45+
<br/>
3946
<div>
40-
<button onClick={(event) => { this.acceptInvitation(senderData, receiverData); this.closePopupBox() }}>Accept</button>
41-
<button onClick={this.closePopupBox()}>Decline</button>
47+
{senderData.blurb}
48+
</div>
49+
<br/>
50+
<div className="notif-btn">
51+
<button className="btn btn-lg" onClick={(event) => { this.acceptInvitation(senderData, receiverData); this.closePopupBox() }}>Accept</button>
52+
<button className="btn btn-lg" onClick={(event) => { this.closePopupBox() }}>Decline</button>
4253
</div>
4354
</div>
4455
)

client/styles/main.scss

+31-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@
153153
}
154154

155155
.popupbox-content {
156-
overflow: hidden;
156+
overflow: auto;
157+
text-align: center;
157158
}
158159

159160
.popupbox-wrapper {
@@ -196,8 +197,12 @@
196197
}
197198

198199
.popupbox-content {
199-
height: 300px;
200+
height: 450px;
201+
width: 350px;
200202
padding: 20px 24px 30px;
203+
background: #3e4444;
204+
color: white;
205+
font-size: 1.25em;
201206
}
202207

203208
.popupbox-titleBar {
@@ -228,6 +233,30 @@
228233
pointer-events: auto;
229234
}
230235

236+
.notif-username {
237+
font-size: 2em;
238+
}
239+
240+
.notif-tagline {
241+
font-size: 15px;
242+
}
243+
244+
.notif-avatar-div {
245+
text-align: center;
246+
margin-bottom: 5px;
247+
}
248+
249+
.notif-avatar {
250+
height: 150px;
251+
width: 150px;
252+
}
253+
254+
.notif-btn {
255+
text-align: center;
256+
display: flex;
257+
justify-content: space-evenly;
258+
}
259+
231260
.popupbox[data-title='bottom'] .popupbox-content { box-shadow: 0 1px 1px rgba(0, 0, 0, .3) }
232261
.popupbox[data-title='bottom'] .popupbox-titleBar { box-shadow: none; border-top: 1px #ccc solid }
233262

0 commit comments

Comments
 (0)