Merge branch 'charts2'

* charts2:
  Updating to latest chart.js to fix prod issue.
This commit is contained in:
Samuel Clay 2016-01-05 11:32:53 -08:00
commit 77387c3faa
3 changed files with 3430 additions and 1374 deletions

View file

@ -7530,9 +7530,9 @@ form.opml_import_form input {
}
.NB-modal-statistics .NB-statistics-stat .NB-statistics-history-days-chart {
margin: -32px 24px;
margin: 32px 24px;
width: 524px;
height: 400px;
height: 300px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;

View file

@ -311,7 +311,9 @@ _.extend(NEWSBLUR.ReaderStatistics.prototype, {
$plot.attr('width', width);
$plot.attr('height', height);
var myLine = new Chart($plot.get(0).getContext("2d")).Line(points, {
scaleLabel : "<%= Math.round(value) %>"
scaleLabel : "<%= Math.round(value) %>",
showTooltips: false,
scaleBeginAtZero: true
});
},
@ -364,7 +366,9 @@ _.extend(NEWSBLUR.ReaderStatistics.prototype, {
$plot.attr('height', height);
var myLine = new Chart($plot.get(0).getContext("2d")).Radar(points, {
scaleShowLabelBackdrop: false
scaleShowLabelBackdrop: false,
showTooltips: false,
scaleFontSize: 16
});
},

4792
media/js/vendor/chart.js vendored

File diff suppressed because it is too large Load diff