diff --git a/public/scss/admin/general/dashboard.scss b/public/scss/admin/general/dashboard.scss index db73c92e75..50c9390072 100644 --- a/public/scss/admin/general/dashboard.scss +++ b/public/scss/admin/general/dashboard.scss @@ -1,4 +1,4 @@ -.template-admin-dashboard .graph-container { +.template-admin-dashboard #analytics-panel .graph-container { min-height: 300px; } .dashboard { @@ -6,19 +6,21 @@ max-width: 100% !important; } + #analytics-panel.fullscreen .graph-container { + width: 100%!important; + height: 100%!important; + max-height: 100%!important; + padding: 40px; + } + .graph-container { + max-height: 400px; position: relative; background: var(--bg-body-bg); &.pie-chart { max-height: 180px; } - - &.fullscreen { - width: 100%!important; - height: 100%!important; - padding: 40px; - } } .graph-legend { diff --git a/public/src/admin/dashboard/topics.js b/public/src/admin/dashboard/topics.js index 5a9bcb262b..32e2bede3e 100644 --- a/public/src/admin/dashboard/topics.js +++ b/public/src/admin/dashboard/topics.js @@ -1,7 +1,7 @@ 'use strict'; define('admin/dashboard/topics', [ - 'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen' + 'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen', ], (graph, hooks, { setupFullscreen }) => { const ACP = {}; diff --git a/public/src/admin/modules/dashboard-line-graph.js b/public/src/admin/modules/dashboard-line-graph.js index 33404236be..cbc2bcf5bf 100644 --- a/public/src/admin/modules/dashboard-line-graph.js +++ b/public/src/admin/modules/dashboard-line-graph.js @@ -72,6 +72,7 @@ export function init({ set, dataset }) { data: data, options: { responsive: true, + maintainAspectRatio: false, scales: { 'left-y-axis': { type: 'linear',