-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathmain.css
93 lines (93 loc) · 1.27 KB
/
main.css
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
<<<<<<< HEAD
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
#scoreLine {
position: absolute;
left: 600px;
}
#deathLine {
position: absolute;
left: 600px;
top: 40px;
}
#maxscoreLine {
position: absolute;
left: 600px;
top: 20px;
}
#deaths{
display: inline;
}
#score {
display: inline;
}
#maxScore {
display: inline;
}
=======
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
#scoreLine {
position: absolute;
left: 600px;
}
#deathLine {
position: absolute;
left: 600px;
top: 40px;
}
#maxscoreLine {
position: absolute;
left: 600px;
top: 20px;
}
#deaths{
display: inline;
}
#score {
display: inline;
}
#maxScore {
display: inline;
}
>>>>>>> 6de7890dadec0bd5fdeaf87b6919746e36729d26