FEATURE: charts will now use tertiary color (#6342)

This commit is contained in:
Joffrey JAFFEUX
2018-08-30 14:56:11 +02:00
committed by GitHub
parent 90e67b671b
commit bb93179609
3 changed files with 26 additions and 7 deletions
@@ -4,7 +4,6 @@ import loadScript from "discourse/lib/load-script";
export default Ember.Component.extend({
classNames: ["admin-report-chart"],
limit: 8,
primaryColor: "rgb(0,136,204)",
total: 0,
willDestroyElement() {
@@ -38,8 +37,8 @@ export default Ember.Component.extend({
data: chartData.map(d => Math.round(parseFloat(d.y))),
backgroundColor: prevChartData.length
? "transparent"
: "rgba(200,220,240,0.3)",
borderColor: this.get("primaryColor")
: model.secondary_color,
borderColor: model.primary_color
}
]
};
@@ -47,7 +46,7 @@ export default Ember.Component.extend({
if (prevChartData.length) {
data.datasets.push({
data: prevChartData.map(d => Math.round(parseFloat(d.y))),
borderColor: this.get("primaryColor"),
borderColor: model.primary_color,
borderDash: [5, 5],
backgroundColor: "transparent",
borderWidth: 1,
@@ -8,7 +8,7 @@ import { renderAvatar } from "discourse/helpers/user-avatar";
// Change this line each time report format change
// and you want to ensure cache is reset
export const SCHEMA_VERSION = 2;
export const SCHEMA_VERSION = 3;
const Report = Discourse.Model.extend({
average: false,