From b51cec80943cc24a6c4cf3e99b965f9d9f1fcd5f Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Tue, 23 Feb 2021 14:27:25 +0100
Subject: [PATCH] Fixed dynamic color for open rate chart

---
 ghost/admin/app/components/gh-members-chart.js | 6 ++++--
 ghost/admin/app/styles/layouts/dashboard.css   | 8 ++++++++
 ghost/admin/app/templates/dashboard.hbs        | 4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ghost/admin/app/components/gh-members-chart.js b/ghost/admin/app/components/gh-members-chart.js
index 9722fa0dfd..f258883410 100644
--- a/ghost/admin/app/components/gh-members-chart.js
+++ b/ghost/admin/app/components/gh-members-chart.js
@@ -128,9 +128,11 @@ export default Component.extend({
     setChartData({dateLabels, dateValues, label = 'Total Members'}) {
         let backgroundColors = this.lineColor;
 
+        
         if (this.chartType === 'open-rate') {
-            backgroundColors = dateValues.map((dateValue) => {
-                if (dateValue) {
+            console.log(dateLabels);
+            backgroundColors = dateLabels.map((val) => {
+                if (val) {
                     return this.lineColor;
                 } else {
                     return (this.nightShift ? '#7C8B9A' : '#CED4D9');
diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css
index 1422da6c8d..5ac9c74b6f 100644
--- a/ghost/admin/app/styles/layouts/dashboard.css
+++ b/ghost/admin/app/styles/layouts/dashboard.css
@@ -441,6 +441,14 @@
     fill: var(--black);
 }
 
+.gh-dashboard-box.top-members .gh-dashboard-header-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid var(--whitegrey-d2);
+    padding-bottom: 14px;
+}
+
 /* Activity feed */
 .gh-dashboard-area.activity-feed {
     grid-column: 3 / 4;
diff --git a/ghost/admin/app/templates/dashboard.hbs b/ghost/admin/app/templates/dashboard.hbs
index 13ade5cb5e..a0a450b62e 100644
--- a/ghost/admin/app/templates/dashboard.hbs
+++ b/ghost/admin/app/templates/dashboard.hbs
@@ -122,8 +122,8 @@
 
         <section class="gh-dashboard-area members-activity">
             {{#if (and this.showTopMembers this.topMembersData)}}
-                <div class="gh-dashboard-box grey activity-feed">
-                    <div class="flex items-center justify-between">
+                <div class="gh-dashboard-box grey top-members">
+                    <div class="gh-dashboard-header-container">
                         <h4 class="gh-dashboard-header">Top members</h4>
                         <h4 class="gh-dashboard-header secondary">Open rate</h4>
                     </div>