treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix shortNumberFormat to within 3 chars without units (#12706)

lolsob-rspec
Takeshi Umeda 2019-12-30 00:59:25 +09:00 committed by Eugen Rochko
parent 1919ddbe6f
commit ed1226c8c8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/utils/numbers.js
View File

@ -4,9 +4,13 @@ import { FormattedNumber } from 'react-intl';
export const shortNumberFormat = number => { export const shortNumberFormat = number => {
if (number < 1000) { if (number < 1000) {
return <FormattedNumber value={number} />; return <FormattedNumber value={number} />;
} else if (number < 1000000) { } else if (number < 10000) {
return <Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={1} />K</Fragment>; 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>; return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={1} />M</Fragment>;
} else {
return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={0} />M</Fragment>;
} }
}; };

4
app/javascript/styles/mastodon/components.scss
View File

@ -6399,13 +6399,13 @@ noscript {
&__links { &__links {
font-size: 14px; font-size: 14px;
color: $darker-text-color; color: $darker-text-color;
padding: 10px 0;
a { a {
display: inline-block; display: inline-block;
color: $darker-text-color; color: $darker-text-color;
text-decoration: none; text-decoration: none;
padding: 10px; padding: 5px 10px;
padding-top: 20px;
font-weight: 500; font-weight: 500;
strong { strong {