Skip to content

Commit 0b1d362

Browse files
committed
added comments to label which stylings belong to which, added styling for pop up chat window and fixed syntax
1 parent fc7939d commit 0b1d362

File tree

1 file changed

+133
-23
lines changed

1 file changed

+133
-23
lines changed

client/styles/main.scss

+133-23
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,79 @@
1-
$brand-color: tomato;
2-
31
body{
42
background: white;
53
margin: 0;
64
}
75
h1, h2 {
8-
color: $brand-color;
6+
color: tomato;
97
display: flex;
108
justify-content: center;
119
}
1210
//navbar and dropdown styles
1311
nav {
14-
background: peachpuff;
15-
display: flex;
12+
background: none;
13+
border-color: none;
1614
justify-content: space-between;
1715
padding: 10px;
16+
margin: 0px;
17+
}
18+
button {
19+
color: lightgray;
20+
}
21+
22+
button:hover {
23+
color: grey;
24+
}
25+
26+
a:hover{
27+
color: grey;
1828
}
19-
.title {
20-
margin: 0;
21-
}
2229

30+
.navbar-brand {
31+
color: lightgray;
32+
font-weight: bold;
33+
font-size: 25px;
34+
}
35+
.title {
36+
margin: 0;
37+
}
2338

24-
.dropdown {
39+
.dropdown {
2540
margin: 0;
2641
}
2742

2843
.navbar, .navbar-default{
2944
display: block;
45+
font-size: x-large;
46+
font-weight: bold;
47+
}
48+
49+
.nav, .navbar-nav, .navbar-right {
50+
background: lightgray;
51+
border-radius: 5px;
52+
opacity: .6;
3053
}
3154

55+
.nav, .navbar-nav, .navbar-right:hover {
56+
color: lightgrey;
57+
cursor: pointer;
58+
}
59+
3260
.caret {
3361
display: none;
3462
}
3563
// card swipe styles
3664
.master-root {
3765
// margin: 20px auto;
66+
background: grey;
67+
border-radius: 5px;
68+
border: 1px solid grey;
3869
height: 50px;
39-
position: relative;
4070
min-height: 400px;
4171
max-height: 100px;
42-
width: 300px;
43-
overflow: hidden;
44-
border: 1px solid grey;
4572
padding: 0px 0px 10px 0px;
73+
position: relative;
74+
opacity: 0.6;
75+
overflow: hidden;
76+
width: 300px;
4677

4778
}
4879

@@ -130,7 +161,6 @@ nav {
130161
}
131162

132163
//css style for pop up box
133-
134164
.popupbox {
135165
width:100%;
136166
height:100%;
@@ -243,7 +273,6 @@ nav {
243273
.popupbox[data-title='bottom'] .popupbox-titleBar { box-shadow: none; border-top: 1px #ccc solid }
244274

245275
//popupbox button style
246-
247276
.popupbox-trigger:hover {
248277
box-shadow: 2px 3px 5px rgba(0,0,0,.2);
249278
margin-top: -12px;
@@ -301,19 +330,100 @@ nav {
301330

302331
.matchmakerEventAndChat-container {
303332
display: flex;
304-
justify-content: space-evenly;
333+
justify-content: center;
305334
margin-bottom: 100px;
306335
}
336+
//chat window
337+
//chat header for the chat window
338+
.chatheaderClicked {
339+
background: darkgrey;
340+
width: 296px;
341+
position: relative;
342+
border-radius: 5px;
343+
z-index: 101;
344+
margin: 5px;
345+
padding: 0 10px;
346+
height: 35px;
347+
line-height: 35px;
348+
font-size: 18px;
349+
font-weight: 700;
350+
color: #616161;
351+
text-align: left;
352+
display: block;
353+
cursor: pointer;
354+
opacity: .9;
355+
}
356+
357+
.messagelist {
358+
background: grey;
359+
border-radius: 5px;
360+
width: 310px;
361+
height: 230px;
362+
position: fixed;
363+
right: 49px;
364+
transition: all .3s;
365+
border: 1px solid transparent;
366+
border-radius: 3px 3px 0 0;
367+
overflow: hidden;
368+
z-index:100;
369+
opacity: .9;
370+
-webkit-box-shadow: rgba(0, 0, 0, 0.0980392) 0 0 1px 2px;
371+
-moz-box-shadow: rgba(0, 0, 0, 0.0980392) 0 0 1px 2px;
372+
box-shadow: rgba(0, 0, 0, 0.0980392) 0 0 1px 2px;
373+
-webkit-transition: all 0.5s ease;
374+
-moz-transition: all 0.5s ease;
375+
-o-transition: all 0.5s ease;
376+
transition: all 0.5s ease;
377+
}
378+
379+
.message {
380+
font-weight: bold;
381+
padding-left: 5px;
382+
}
383+
384+
.messagelist.shown {
385+
bottom: 0px;
386+
}
387+
388+
.messagelist.bottom {
389+
bottom: -183px;
390+
}
307391

308392
#chatbar {
309-
border: black solid 1px;
393+
background: #f8f8f8;
394+
border: grey solid 1px;
395+
border-radius: 5px;
396+
position: absolute;
397+
bottom: 4px;
310398
width: 300px;
399+
z-index: 101;
400+
right: 4px;
311401
}
312402

313-
.messagelist {
314-
border: black solid 1px;
315-
height: 300px;
316-
width: 300px;
317-
overflow: auto;
318-
word-wrap: normal;
403+
//matchmaker page styligs
404+
#react-root {
405+
background: black;
406+
background-position: center;
407+
background-image: url(http://cdn.dota2.com/apps/dota2/images/international2017/overview/bg_battlepass.jpg);
408+
}
409+
410+
.slider-container {
411+
border-radius: 5px;
412+
height: 150px;
413+
display: flex;
414+
justify-content: center;
415+
margin-bottom: 35px;
416+
}
417+
418+
.sliderSpace {
419+
width: 525px;
420+
margin: 30px;
421+
}
422+
423+
.slideText{
424+
font-size: x-large;
425+
color: white;
426+
text-align: center;
427+
padding: 10px;
428+
width: 530px;
319429
}

0 commit comments

Comments
 (0)