From 9e69958099e70f1836cfe6da714a5297e6cf7c95 Mon Sep 17 00:00:00 2001 From: stefanorigano Date: Wed, 23 Aug 2017 11:02:12 +0200 Subject: [PATCH] [REF] web: review graphs layout --- addons/web/static/src/js/fields/basic_fields.js | 5 +++-- addons/web/static/src/js/views/graph/graph_renderer.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 7b15d30202d..da7def82dd2 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -2040,7 +2040,8 @@ var JournalDashboardGraph = AbstractField.extend({ .y(function (d) { return d.value; }) .showValues(false) .showYAxis(false) - .margin({'left': 0, 'right': 0, 'top': 0, 'bottom': 40}); + .color(['#875A7B', '#526774', '#FA8072']) + .margin({'left': 0, 'right': 0, 'top': 20, 'bottom': 20}); self.chart.xAxis.axisLabel(self.data[0].title); self.chart.yAxis.tickFormat(d3.format(',.2f')); @@ -2056,7 +2057,7 @@ var JournalDashboardGraph = AbstractField.extend({ } d3.select(self.$('svg')[0]) .datum(self.data) - .transition().duration(1200) + .transition().duration(600) .call(self.chart); self._customizeChart(); diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js index 6a976c3a588..2c3a7a7db19 100644 --- a/addons/web/static/src/js/views/graph/graph_renderer.js +++ b/addons/web/static/src/js/views/graph/graph_renderer.js @@ -161,8 +161,8 @@ return AbstractRenderer.extend({ var chart = nv.models.multiBarChart(); chart.options({ - margin: {left: 120, bottom: 60}, - delay: 250, + margin: {left: 80, bottom: 100, top: 80, right: 0}, + delay: 100, transition: 10, showLegend: _.size(data) <= MAX_LEGEND_LENGTH, showXAxis: true, @@ -310,7 +310,7 @@ return AbstractRenderer.extend({ var chart = nv.models.lineChart(); chart.options({ - margin: {left: 120, bottom: 60}, + margin: {left: 80, bottom: 100, top: 80, right: 0}, useInteractiveGuideline: true, showLegend: _.size(data) <= MAX_LEGEND_LENGTH, showXAxis: true,