diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 8df6830c52..e79bd1a3c3 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -3,6 +3,7 @@ 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';
@@ -87,9 +88,11 @@ class Notification extends ImmutablePureComponent {
+
+
+
-
@@ -120,6 +123,9 @@ class Notification extends ImmutablePureComponent {
+
+
+
@@ -139,6 +145,9 @@ class Notification extends ImmutablePureComponent {
+
+
+
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5765829a4f..b2e9bd1df4 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1489,6 +1489,7 @@ a.account__display-name {
cursor: default;
color: $darker-text-color;
font-size: 15px;
+ line-height: 22px;
position: relative;
.fa {
@@ -1496,7 +1497,7 @@ a.account__display-name {
}
> span {
- display: block;
+ display: inline;
overflow: hidden;
text-overflow: ellipsis;
}
@@ -1526,6 +1527,10 @@ a.account__display-name {
}
}
+.notification__relative_time {
+ float: right;
+}
+
.display-name {
display: block;
max-width: 100%;