diff --git a/ghost/admin/app/controllers/dashboard.js b/ghost/admin/app/controllers/dashboard.js index d6b63af2ba..1362933c5d 100644 --- a/ghost/admin/app/controllers/dashboard.js +++ b/ghost/admin/app/controllers/dashboard.js @@ -83,7 +83,9 @@ export default class DashboardController extends Controller { const rangeStartMRR = dateValues.length ? dateValues[0] : 0; const percentGrowth = rangeStartMRR !== 0 ? ((currentMRR - rangeStartMRR) / rangeStartMRR) * 100 : 0; this.mrrStatsData = { - current: `${getSymbol(currencyStats.currency)}${currentMRR}`, + currentAmount: currentMRR, + currency: getSymbol(currencyStats.currency), + currencyClass: (getSymbol(currencyStats.currency).length === 3 ? 'post' : 'pre'), percentGrowth: percentGrowth.toFixed(1), percentClass: (percentGrowth > 0 ? 'positive' : (percentGrowth < 0 ? 'negative' : '')), options: { diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css index 0566832f8f..d6cc13db9a 100644 --- a/ghost/admin/app/styles/layouts/dashboard.css +++ b/ghost/admin/app/styles/layouts/dashboard.css @@ -264,6 +264,8 @@ } .gh-dashboard-summary .data { + display: flex; + align-items: flex-start; font-size: 3.9rem; line-height: 4rem; font-weight: 600; @@ -273,6 +275,12 @@ white-space: nowrap; } +.gh-dashboard-summary .data .currency { + font-size: 0.66em; + line-height: 1.25em; + margin-right: 2px; +} + .gh-dashboard-summary.small .data { font-size: 2.8rem; letter-spacing: -0.1px; diff --git a/ghost/admin/app/templates/dashboard.hbs b/ghost/admin/app/templates/dashboard.hbs index 8b7c7a2c65..38ea3e5831 100644 --- a/ghost/admin/app/templates/dashboard.hbs +++ b/ghost/admin/app/templates/dashboard.hbs @@ -44,7 +44,7 @@

{{else}}
-
{{this.mrrStatsData.current}}
+
{{this.mrrStatsData.currency}}{{format-number this.mrrStatsData.currentAmount}}
{{this.mrrStatsData.percentGrowth}}%
{{#if this.mrrStatsData}}