From 9148f7675be6b74dea34d75c9920ac716cb99204 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 22 Jan 2019 11:20:50 +0100
Subject: [PATCH] FIX: better handling of resizing in stacked charts (#6921)

---
 .../admin/components/admin-report-stacked-chart.js.es6      | 4 ++--
 .../templates/components/admin-report-stacked-chart.hbs     | 2 +-
 .../common/admin/admin_report_stacked_chart.scss            | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
index 9b9d27e81fc..961a1fb4ecc 100644
--- a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
@@ -68,9 +68,9 @@ export default Ember.Component.extend({
     return {
       type: "bar",
       data,
-      responsive: true,
-      maintainAspectRatio: false,
       options: {
+        responsive: true,
+        maintainAspectRatio: false,
         hover: { mode: "index" },
         tooltips: {
           mode: "index",
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-stacked-chart.hbs b/app/assets/javascripts/admin/templates/components/admin-report-stacked-chart.hbs
index 9c36cfacea9..dfc603d0cd9 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-stacked-chart.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-stacked-chart.hbs
@@ -1,3 +1,3 @@
 <div class="chart-canvas-container">
-  <canvas class="chart-canvas" height="250"></canvas>
+  <canvas class="chart-canvas"></canvas>
 </div>
diff --git a/app/assets/stylesheets/common/admin/admin_report_stacked_chart.scss b/app/assets/stylesheets/common/admin/admin_report_stacked_chart.scss
index bbbd92c6e07..e6e0267ac01 100644
--- a/app/assets/stylesheets/common/admin/admin_report_stacked_chart.scss
+++ b/app/assets/stylesheets/common/admin/admin_report_stacked_chart.scss
@@ -1,9 +1,5 @@
 .admin-report-stacked-chart {
-  display: flex;
-  justify-content: space-between;
-
   .chart-canvas-container {
-    flex: 5;
-    margin: 0;
+    height: 250px;
   }
 }