Skip to content

Commit 61d2f26

Browse files
authored
Merge pull request #85 from remiolsen/chartjs
Move from high charts to chart.js
2 parents a9784c8 + 5875765 commit 61d2f26

10 files changed

Lines changed: 1287 additions & 1406 deletions

File tree

make_dashboards/templates/external/css/styles.css

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -75,32 +75,6 @@ footer img {
7575
.balance_plot.coming_soon { margin: 22px 0; }
7676
.success_plot.coming_soon { margin: 35px 0; }
7777

78-
.tat_plot .highcharts-container svg .highcharts-series-group .highcharts-series-0 path {
79-
fill: #ccc;
80-
}
81-
.tat_plot .highcharts-container svg .highcharts-series-group .highcharts-series-0 circle {
82-
fill: #fff;
83-
r: 120;
84-
}
85-
#finished_proj_tat svg .highcharts-series-group .highcharts-series-0 circle,
86-
#lp_proj_tats svg .highcharts-series-group .highcharts-series-0 circle {
87-
fill: #f2f2f2
88-
}
89-
90-
#clock_time, #clock_date {
91-
float:right;
92-
clear:right;
93-
text-align:right;
94-
margin-right: 100px;
95-
}
96-
#clock_time {
97-
margin-top: 15px;
98-
font-size: 36px;
99-
line-height: 32px;
100-
}
101-
#clock_date {
102-
font-size: 22px;
103-
}
10478

10579
.mid-left p {
10680
font-size: 16px;
@@ -157,77 +131,3 @@ footer img {
157131
-webkit-transform: rotate(-90deg);
158132
transform: rotate(-90deg);
159133
}
160-
161-
/* Header Clock */
162-
.hero-circle {
163-
width: 80px;
164-
height: 80px;
165-
margin: 8px 0 0 auto;
166-
position: relative;
167-
border: 1px solid #666;
168-
border-radius: 50%;
169-
box-shadow: 0 1px 4px rgba(34, 34, 34, 0.3), inset 0 1px 4px rgba(34, 34, 34, 0.3);
170-
}
171-
.hero-face {
172-
width: 100%;
173-
height: 100%
174-
}
175-
176-
.hero-face:after {
177-
position: absolute;
178-
top: 50%;
179-
left: 50%;
180-
width: 4px;
181-
height: 4px;
182-
margin: -2px 0 0 -2px;
183-
background: #666;
184-
border-radius: 4px;
185-
content: "";
186-
display: block
187-
}
188-
189-
.hero-hour {
190-
width: 0;
191-
height: 0;
192-
position: absolute;
193-
/*top: calc(50% - 2px);
194-
left: calc(50% + 1px);*/
195-
top: 37px;
196-
left: 40px;
197-
margin: 1px 0 -1px -25%;
198-
padding: 1px 0 1px 25%;
199-
background: #666;
200-
-webkit-transform-origin: 100% 50%;
201-
-ms-transform-origin: 100% 50%;
202-
transform-origin: 100% 50%;
203-
border-radius: 1px 0 0 1px
204-
}
205-
206-
.hero-minute {
207-
width: 0;
208-
height: 0;
209-
position: absolute;
210-
top: 50%;
211-
left: 50%;
212-
margin: -40% -1px 0;
213-
padding: 40% 1px 0;
214-
background: #666;
215-
-webkit-transform-origin: 50% 100%;
216-
-ms-transform-origin: 50% 100%;
217-
transform-origin: 50% 100%;
218-
border-radius: 3px 3px 0 0
219-
}
220-
221-
.hero-second {
222-
width: 0;
223-
height: 0;
224-
position: absolute;
225-
top: 50%;
226-
left: 50%;
227-
margin: -40% -0.5px 0 0;
228-
padding: 40% 0.5px 0;
229-
background: #666;
230-
-webkit-transform-origin: 50% 100%;
231-
-ms-transform-origin: 50% 100%;
232-
transform-origin: 50% 100%
233-
}

make_dashboards/templates/external/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ <h1><a href="https://ngisweden.scilifelab.se/">NGI Stockholm Status</a></h1>
7373
<script src="js/bootstrap.min.js"></script>
7474
<script src="js/moment.js"></script>
7575
<script src="js/chroma.min.js"></script>
76-
<script src="js/highcharts.js"></script>
77-
<script src="js/highcharts-more.js"></script>
78-
<script src="js/solid-gauge.js"></script>
76+
<script src="js/chart.umd.min.js"></script>
77+
<script src="js/chartjs-plugin-annotation.min.js"></script>
7978
<script type="text/javascript">
8079
var data = {{ d.json }};
8180
var deliverytimes_data = {{ dt_data }};

make_dashboards/templates/external/js/chart.umd.min.js

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

make_dashboards/templates/external/js/chartjs-plugin-annotation.min.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)