Skip to content

Commit fb08f67

Browse files
Merge branch 'feature-time'
2 parents e7ff80f + 01d290b commit fb08f67

File tree

9 files changed

+462
-44
lines changed

9 files changed

+462
-44
lines changed

css/main.css

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,47 @@ body {
4646
z-index: 49;
4747
}
4848

49+
#timebox {
50+
z-index: 49;
51+
background-color: #fff;
52+
position: absolute;
53+
top: 7px;
54+
left: 30px;
55+
//margin-left: -145px;
56+
height: 28px;
57+
width: 225px;
58+
border-radius: 20px;
59+
box-shadow: 0 0 5px #888;
60+
font-size: 11px;
61+
}
62+
#timebox svg {
63+
width: 28px;
64+
height: 28px;
65+
}
66+
#timebox svg path {
67+
-webkit-transition: all 0.4s ease-in-out;
68+
-moz-transition: all 0.4s ease-in-out;
69+
-ms-transition: all 0.4s ease-in-out;
70+
-o-transition: all 0.4s ease-in-out;
71+
transition: all 0.4s ease-in-out;
72+
fill: #00a3d3;
73+
}
74+
#timebox.past svg path {
75+
fill: #c00;
76+
}
77+
#timebox span {
78+
line-height: 14px;
79+
}
80+
#timebox .current {
81+
margin-left: 5px;
82+
}
83+
#timebox .local {
84+
margin-left: 15px;
85+
}
86+
4987
#mapscreen {
5088
float: right;
89+
position: relative;
5190
}
5291

5392
#map img {
@@ -330,6 +369,10 @@ header > div {
330369
text-decoration: none;
331370
color: #00A3D3;
332371
}
372+
#main .data dl > dt.receivers {
373+
font-size: 12px;
374+
font-weight: normal;
375+
}
333376

334377
.flatpage {
335378
margin-top: 55px;
@@ -536,13 +579,6 @@ header > div {
536579
line-height: 11px;
537580
font-size: 11px;
538581
}
539-
#main .data dl > dt.receivers {
540-
font-size: 10px;
541-
font-weight: normal;
542-
}
543-
#main .data dl > dd.receivers {
544-
font-size: 10px;
545-
}
546582
#main .row .data img {
547583
right: 5%;
548584
top: 50px;
@@ -585,13 +621,6 @@ header > div {
585621
line-height: 11px;
586622
font-size: 11px;
587623
}
588-
#main .data dl > dt.receivers {
589-
font-size: 10px;
590-
font-weight: normal;
591-
}
592-
#main .data dl > dd.receivers {
593-
font-size: 10px;
594-
}
595624
#main .row .header .graph {
596625
width: 150px;
597626
height: 40px;

glyphs/icon-clock.svg

Lines changed: 144 additions & 0 deletions
Loading

glyphs/icon-clock_simple.svg

Lines changed: 60 additions & 0 deletions
Loading

glyphs/icon-code.svg

Lines changed: 72 additions & 14 deletions
Loading

0 commit comments

Comments
 (0)