diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2019-12-30 00:59:25 +0900 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-04 23:04:52 +0100 |
commit | 83359fef2b04e81b35b047510ddb0c79bcf8ddaa (patch) | |
tree | 0e2bb7334c7954bee2962ed78565046e3b974725 /app/javascript | |
parent | 01eaeab56df4da4c697b1096f40a400cc9e2b8e8 (diff) |
[Glitch] Fix shortNumberFormat to within 3 chars without units
Port 0e8c0287d01d270238aeb7f25c6337b2bcb8afba to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/accounts.scss | 4 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/util/numbers.js | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss index 5be4da48a..6305e2a4d 100644 --- a/app/javascript/flavours/glitch/styles/components/accounts.scss +++ b/app/javascript/flavours/glitch/styles/components/accounts.scss @@ -681,13 +681,13 @@ &__links { font-size: 14px; color: $darker-text-color; + padding: 10px 0; a { display: inline-block; color: $darker-text-color; text-decoration: none; - padding: 10px; - padding-top: 20px; + padding: 5px 10px; font-weight: 500; strong { diff --git a/app/javascript/flavours/glitch/util/numbers.js b/app/javascript/flavours/glitch/util/numbers.js index f7e4ceb93..af18dcfdd 100644 --- a/app/javascript/flavours/glitch/util/numbers.js +++ b/app/javascript/flavours/glitch/util/numbers.js @@ -4,9 +4,13 @@ import { FormattedNumber } from 'react-intl'; export const shortNumberFormat = number => { if (number < 1000) { return <FormattedNumber value={number} />; - } else if (number < 1000000) { + } else if (number < 10000) { return <Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={1} />K</Fragment>; - } else { + } else if (number < 1000000) { + return <Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={0} />K</Fragment>; + } else if (number < 10000000) { return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={1} />M</Fragment>; + } else { + return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={0} />M</Fragment>; } }; |