From b5d5689d5c10fc63182197ec3e54d81d724d0b51 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 5 May 2016 10:34:15 +0100 Subject: [PATCH] Make right-aligned big numbers left aligned --- app/assets/stylesheets/components/big-number.scss | 3 +-- app/templates/components/big-number.html | 4 ++-- app/templates/views/dashboard/today.html | 6 +++--- app/templates/views/usage.html | 14 +++++++------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/components/big-number.scss b/app/assets/stylesheets/components/big-number.scss index f4ef4cac6..fbc7b6d78 100644 --- a/app/assets/stylesheets/components/big-number.scss +++ b/app/assets/stylesheets/components/big-number.scss @@ -11,10 +11,9 @@ } -.big-number-right-aligned { +.big-number-smaller { @extend %big-number; @include bold-36($tabular-numbers: true); - text-align: right; } .big-number-with-status { diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html index dbc12bd40..df8d91348 100644 --- a/app/templates/components/big-number.html +++ b/app/templates/components/big-number.html @@ -1,5 +1,5 @@ -{% macro big_number(number, label, label_link=None, currency='', right_aligned=False) %} -
+{% macro big_number(number, label, label_link=None, currency='', smaller=False) %} +
{% if number is number %} {% if currency %} {{ "{}{:,.2f}".format(currency, number) }} diff --git a/app/templates/views/dashboard/today.html b/app/templates/views/dashboard/today.html index ad1ad74c1..7bd4042a6 100644 --- a/app/templates/views/dashboard/today.html +++ b/app/templates/views/dashboard/today.html @@ -47,7 +47,7 @@
- {{ big_number("Unlimited", 'free email allowance', right_aligned=True) }} + {{ big_number("Unlimited", 'free email allowance', smaller=True) }}
@@ -57,10 +57,10 @@ (sms_chargeable * sms_rate), 'spent on text messages', currency="£", - right_aligned=True + smaller=True ) }} {% else %} - {{ big_number(sms_allowance_remaining, 'free text messages left', right_aligned=True) }} + {{ big_number(sms_allowance_remaining, 'free text messages left', smaller=True) }} {% endif %}
diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 9cffca822..9280d3a60 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -21,21 +21,21 @@

Emails

- {{ big_number(emails_sent, 'sent', right_aligned=True) }} - {{ big_number("Unlimited", 'free allowance', right_aligned=True) }} + {{ big_number(emails_sent, 'sent', smaller=True) }} + {{ big_number("Unlimited", 'free allowance', smaller=True) }}

Text messages

- {{ big_number(sms_sent, 'sent', right_aligned=True) }} - {{ big_number(sms_free_allowance, 'free allowance', right_aligned=True) }} - {{ big_number(sms_allowance_remaining, 'free allowance remaining', right_aligned=True) }} + {{ big_number(sms_sent, 'sent', smaller=True) }} + {{ big_number(sms_free_allowance, 'free allowance', smaller=True) }} + {{ big_number(sms_allowance_remaining, 'free allowance remaining', smaller=True) }} {% if sms_chargeable %} {{ big_number( sms_chargeable, 'at {:.1f}p per message'.format(sms_rate * 100), - right_aligned=True + smaller=True ) }} {% endif %}
@@ -54,7 +54,7 @@ (sms_chargeable * sms_rate), 'spent', currency="£", - right_aligned=True + smaller=True ) }}