Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2231 from ZeiP/bug/1153_stats

Browse source 
Change the Flash charts to Charts.js
This commit is contained in:
Jyri-Petteri Paloposki 2019-05-29 19:33:57 +03:00 • committed by GitHub
commit 6ad1e2cf93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 552 additions and 1113 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/application.js
View file

@ -36,3 +36,6 @@
//= require jquery.truncator
//= require superfish
//= require supersubs
//= require Chart.min
//= require chartjs-plugin-colorschemes.min

11
app/assets/javascripts/chartjs-plugin-colorschemes.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
app/assets/stylesheets/legacy.scss
View file

@ -1266,7 +1266,7 @@ button.positive, .widgets a.positive{
background-color:black;
}
.stats_content .open-flash-chart, .stats_content .stats_module {
.stats_content .chart, .stats_content .stats_module {
float: left;
width: 450px;
margin-right:20px;

BIN
app/assets/swfs/expressInstall.swf
View file

Binary file not shown.

BIN
app/assets/swfs/open-flash-chart.swf
View file

Binary file not shown.