diff --git a/ghost/admin/app/components/dashboard/v5/chart-email.hbs b/ghost/admin/app/components/dashboard/v5/chart-email.hbs index c789b44dc7..4580221a80 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-email.hbs +++ b/ghost/admin/app/components/dashboard/v5/chart-email.hbs @@ -12,8 +12,7 @@
-

 

-
{{format-number this.dataEmailsSent}}
+
{{format-number this.dataEmailsSent}}
Sent in the past 30 days
diff --git a/ghost/admin/app/components/dashboard/v5/chart-email.js b/ghost/admin/app/components/dashboard/v5/chart-email.js index d7f5d93c61..646ba5ff44 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-email.js +++ b/ghost/admin/app/components/dashboard/v5/chart-email.js @@ -51,7 +51,6 @@ export default class ChartEmailOpenRate extends Component { backgroundColor: '#14b8ff', tension: 0.1, cubicInterpolationMode: 'monotone', - fill: false, pointRadius: 0, pointHitRadius: 10, borderColor: '#14b8ff', diff --git a/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs b/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs index edca886f62..03baca852f 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs +++ b/ghost/admin/app/components/dashboard/v5/chart-engagement.hbs @@ -9,8 +9,7 @@
-

 

-
{{this.data7Days}}
+
{{this.data7Days}}
Last 7 days
diff --git a/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.js b/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.js index 5cce4e5c57..c387cf6c6d 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.js +++ b/ghost/admin/app/components/dashboard/v5/chart-monthly-revenue.js @@ -80,22 +80,22 @@ export default class ChartMonthlyRevenue extends Component { display: false, maxTicksLimit: 5, autoSkip: true, - maxRotation: 0, - minRotation: 0 + maxRotation: 0, + minRotation: 0 }, type: 'time', time: { - displayFormats: { - 'millisecond': 'MMM DD', - 'second': 'MMM DD', - 'minute': 'MMM DD', - 'hour': 'MMM DD', - 'day': 'MMM DD', - 'week': 'MMM DD', - 'month': 'MMM DD', - 'quarter': 'MMM DD', - 'year': 'MMM DD', - } + displayFormats: { + millisecond: 'MMM DD', + second: 'MMM DD', + minute: 'MMM DD', + hour: 'MMM DD', + day: 'MMM DD', + week: 'MMM DD', + month: 'MMM DD', + quarter: 'MMM DD', + year: 'MMM DD' + } } }] } diff --git a/ghost/admin/app/components/dashboard/v5/chart-paid-members.js b/ghost/admin/app/components/dashboard/v5/chart-paid-members.js index 5ce0edc02f..bd9aa36c50 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-paid-members.js +++ b/ghost/admin/app/components/dashboard/v5/chart-paid-members.js @@ -90,17 +90,17 @@ export default class ChartPaidMembers extends Component { }, type: 'time', time: { - displayFormats: { - 'millisecond': 'MMM DD', - 'second': 'MMM DD', - 'minute': 'MMM DD', - 'hour': 'MMM DD', - 'day': 'MMM DD', - 'week': 'MMM DD', - 'month': 'MMM DD', - 'quarter': 'MMM DD', - 'year': 'MMM DD', - } + displayFormats: { + millisecond: 'MMM DD', + second: 'MMM DD', + minute: 'MMM DD', + hour: 'MMM DD', + day: 'MMM DD', + week: 'MMM DD', + month: 'MMM DD', + quarter: 'MMM DD', + year: 'MMM DD' + } } }] } diff --git a/ghost/admin/app/components/dashboard/v5/chart-total-members.js b/ghost/admin/app/components/dashboard/v5/chart-total-members.js index c9a45376a4..1d4e4d158f 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-total-members.js +++ b/ghost/admin/app/components/dashboard/v5/chart-total-members.js @@ -80,22 +80,22 @@ export default class ChartTotalMembers extends Component { display: false, maxTicksLimit: 5, autoSkip: true, - maxRotation: 0, - minRotation: 0 + maxRotation: 0, + minRotation: 0 }, type: 'time', time: { - displayFormats: { - 'millisecond': 'MMM DD', - 'second': 'MMM DD', - 'minute': 'MMM DD', - 'hour': 'MMM DD', - 'day': 'MMM DD', - 'week': 'MMM DD', - 'month': 'MMM DD', - 'quarter': 'MMM DD', - 'year': 'MMM DD', - } + displayFormats: { + millisecond: 'MMM DD', + second: 'MMM DD', + minute: 'MMM DD', + hour: 'MMM DD', + day: 'MMM DD', + week: 'MMM DD', + month: 'MMM DD', + quarter: 'MMM DD', + year: 'MMM DD' + } } }] } diff --git a/ghost/admin/app/components/dashboard/v5/chart-total-paid.js b/ghost/admin/app/components/dashboard/v5/chart-total-paid.js index fb7dbff63b..bfa153478c 100644 --- a/ghost/admin/app/components/dashboard/v5/chart-total-paid.js +++ b/ghost/admin/app/components/dashboard/v5/chart-total-paid.js @@ -80,22 +80,22 @@ export default class ChartTotalPaid extends Component { display: false, maxTicksLimit: 5, autoSkip: true, - maxRotation: 0, - minRotation: 0 + maxRotation: 0, + minRotation: 0 }, type: 'time', time: { - displayFormats: { - 'millisecond': 'MMM DD', - 'second': 'MMM DD', - 'minute': 'MMM DD', - 'hour': 'MMM DD', - 'day': 'MMM DD', - 'week': 'MMM DD', - 'month': 'MMM DD', - 'quarter': 'MMM DD', - 'year': 'MMM DD', - } + displayFormats: { + millisecond: 'MMM DD', + second: 'MMM DD', + minute: 'MMM DD', + hour: 'MMM DD', + day: 'MMM DD', + week: 'MMM DD', + month: 'MMM DD', + quarter: 'MMM DD', + year: 'MMM DD' + } } }] } diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css index 07b185bfa6..f3a2108522 100644 --- a/ghost/admin/app/styles/layouts/dashboard.css +++ b/ghost/admin/app/styles/layouts/dashboard.css @@ -1209,6 +1209,10 @@ a.gh-dashboard-container { font-size: 2.2rem; } +.gh-dashboard5-number.is-solo { + margin-top: 46px; +} + .gh-dashboard5-metric { display: flex; align-items: center;