From e1b00757a69ff1cb49311addb7aa76650d680e43 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 1 Mar 2017 01:18:34 +0100 Subject: [PATCH] Fix #291 - Add visual indication that numbers for remote users may be inaccurate --- .../features/account/components/action_bar.jsx | 14 ++++++++++---- app/assets/stylesheets/components.scss | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/components/features/account/components/action_bar.jsx b/app/assets/javascripts/components/features/account/components/action_bar.jsx index 48925817c9..3668a0f131 100644 --- a/app/assets/javascripts/components/features/account/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx @@ -11,7 +11,8 @@ const messages = defineMessages({ unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, block: { id: 'account.block', defaultMessage: 'Block @{name}' }, follow: { id: 'account.follow', defaultMessage: 'Follow' }, - report: { id: 'account.report', defaultMessage: 'Report @{name}' } + report: { id: 'account.report', defaultMessage: 'Report @{name}' }, + disclaimer: { id: 'account.disclaimer', defaultMessage: 'This user is from another instance. This number may be larger.' } }); const outerDropdownStyle = { @@ -43,6 +44,7 @@ const ActionBar = React.createClass({ const { account, me, intl } = this.props; let menu = []; + let extraInfo = ''; menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.props.onMention }); menu.push(null); @@ -61,6 +63,10 @@ const ActionBar = React.createClass({ menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport }); } + if (account.get('domain') !== null) { + extraInfo = *; + } + return (
@@ -70,17 +76,17 @@ const ActionBar = React.createClass({
- + {extraInfo} - + {extraInfo} - + {extraInfo}
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index bb3001a15b..bf8411ae78 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -391,6 +391,10 @@ a.status__content__spoiler-link { font-weight: 500; color: $color5; } + + abbr { + color: lighten($color1, 26%); + } } .status__display-name, .status__relative-time, .detailed-status__display-name, .detailed-status__datetime, .detailed-status__application, .account__display-name {