about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/notifications/components/notification.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-12-31 18:12:07 +0100
committerGitHub <noreply@github.com>2018-12-31 18:12:07 +0100
commite3dc8870bf3ec2e143dfe5be258ccba608f0e85f (patch)
tree68e9d221d0ba53211bba627a41003fb089b290ea /app/javascript/mastodon/features/notifications/components/notification.js
parent8f5fdab5bf681ff45a07965940bc45c9061a2f89 (diff)
Remove visible timestamps for notifications (#9675)
Revert #9423. Issues with line breaks / clutter.
Diffstat (limited to 'app/javascript/mastodon/features/notifications/components/notification.js')
-rw-r--r--app/javascript/mastodon/features/notifications/components/notification.js18
1 files changed, 8 insertions, 10 deletions
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index e79bd1a3c..44da423ad 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import StatusContainer from '../../../containers/status_container';
 import AccountContainer from '../../../containers/account_container';
-import RelativeTimestamp from '../../../components/relative_timestamp';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import Permalink from '../../../components/permalink';
 import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -86,13 +85,12 @@ class Notification extends ImmutablePureComponent {
             <div className='notification__favourite-icon-wrapper'>
               <i className='fa fa-fw fa-user-plus' />
             </div>
+
             <span title={notification.get('created_at')}>
               <FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} />
-              <span className='notification__relative_time'>
-                <RelativeTimestamp timestamp={notification.get('created_at')} />
-              </span>
             </span>
           </div>
+
           <AccountContainer id={account.get('id')} withNote={false} hidden={this.props.hidden} />
         </div>
       </HotKeys>
@@ -122,9 +120,9 @@ class Notification extends ImmutablePureComponent {
             <div className='notification__favourite-icon-wrapper'>
               <i className='fa fa-fw fa-star star-icon' />
             </div>
-            <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
-            <span className='notification__relative_time'>
-              <RelativeTimestamp className='notification__relative_time' timestamp={notification.get('created_at')} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
             </span>
           </div>
 
@@ -144,9 +142,9 @@ class Notification extends ImmutablePureComponent {
             <div className='notification__favourite-icon-wrapper'>
               <i className='fa fa-fw fa-retweet' />
             </div>
-            <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
-            <span className='notification__relative_time'>
-              <RelativeTimestamp className='notification__relative_time' timestamp={notification.get('created_at')} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
             </span>
           </div>